fixed the wait logic for session close

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@811350 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 2 deletions

diff --git a/python/qpid/messaging.py b/python/qpid/messaging.py
index 2bf822b4c8..d755aa5054 100644
--- a/python/qpid/messaging.py
+++ b/python/qpid/messaging.py
@@ -286,6 +286,7 @@ class Session:
     self.closed = False
 
     self._lock = connection._lock
+    self.running = True
     self.thread = Thread(target = self.run)
     self.thread.setDaemon(True)
     self.thread.start()
@@ -460,6 +461,7 @@ class Session:
 
   @synchronized
   def run(self):
+    self.running = True
     try:
       while True:
         msg = self._get(self._pred)
@@ -470,7 +472,7 @@ class Session:
           if self._peek(self._pred) is None:
             self.connection._waiter.notifyAll()
     finally:
-      self.closed = True
+      self.running = False
       self.connection._waiter.notifyAll()
 
   @synchronized
@@ -483,7 +485,7 @@ class Session:
 
     self.closing = True
     self._wakeup()
-    self._ewait(lambda: self.closed)
+    self._ewait(lambda: self.closed and not self.running)
     while self.thread.isAlive():
       self.thread.join(3)
     self.thread = None