From 9bbb43dd1ad0d570d059f18a20db2605c76c8a1e Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Thu, 24 Apr 2014 08:42:30 +0200 Subject: [PATCH] [1.7.x] Ignored repeated calls to connection.close(). Backport of d4cc59ef from master --- django/db/backends/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py index 7c918e0609..4dab0e3e16 100644 --- a/django/db/backends/__init__.py +++ b/django/db/backends/__init__.py @@ -188,6 +188,8 @@ class BaseDatabaseWrapper(object): # Don't call validate_no_atomic_block() to avoid making it difficult # to get rid of a connection in an invalid state. The next connect() # will reset the transaction state anyway. + if self.closed_in_transaction or self.connection is None: + return try: self._close() finally: