From deadff9a60662551ae0e55f6bc69920e66119dcc Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Wed, 24 Apr 2013 16:38:24 +0100
Subject: [PATCH] force_close_all should not acquire mutex

---
 kombu/connection.py | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/kombu/connection.py b/kombu/connection.py
index 9a6146dc..9d1104ef 100644
--- a/kombu/connection.py
+++ b/kombu/connection.py
@@ -919,7 +919,7 @@ class Resource(object):
         """
         dirty = self._dirty
         resource = self._resource
-        while 1:
+        while 1:  # - acquired
             try:
                 dres = dirty.pop()
             except KeyError:
@@ -928,23 +928,18 @@ class Resource(object):
                 self.close_resource(dres)
             except AttributeError:  # Issue #78
                 pass
-
-        mutex = getattr(resource, 'mutex', None)
-        if mutex:
-            mutex.acquire()
-        try:
-            while 1:
-                try:
-                    res = resource.queue.pop()
-                except IndexError:
-                    break
-                try:
-                    self.close_resource(res)
-                except AttributeError:
-                    pass  # Issue #78
-        finally:
-            if mutex:  # pragma: no cover
-                mutex.release()
+        while 1:  # - available
+            # deque supports '.clear', but lists do not, so for that
+            # reason we use pop here, so that the underlying object can
+            # be any object supporting '.pop' and '.append'.
+            try:
+                res = resource.queue.pop()
+            except IndexError:
+                break
+            try:
+                self.close_resource(res)
+            except AttributeError:
+                pass  # Issue #78
 
     if os.environ.get('KOMBU_DEBUG_POOL'):  # pragma: no cover
         _orig_acquire = acquire