summaryrefslogtreecommitdiff
path: root/python/qpid/queue.py
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2008-05-15 22:15:33 +0000
committerRafael H. Schloming <rhs@apache.org>2008-05-15 22:15:33 +0000
commit9a3d8ad1695d1b7f2cb42d77c6106245c521566c (patch)
tree9f9502fb99f594cfd4d0a60d817faf6ca6ab3d69 /python/qpid/queue.py
parent82950090c94ed3ace2d7ab4c410cdd72fed5c176 (diff)
downloadqpid-python-9a3d8ad1695d1b7f2cb42d77c6106245c521566c.tar.gz
QPID-1064: made qpid-config close the session/connection; added incoming.stop() to cancel incoming messages and join on the listener thread; made managementBroker.removeChannel use incoming.stop(); modified session.close to wait on _closed rather than on channel == None
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@656871 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qpid/queue.py')
-rw-r--r--python/qpid/queue.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/python/qpid/queue.py b/python/qpid/queue.py
index a8a5c0d9ad..830ea6060d 100644
--- a/python/qpid/queue.py
+++ b/python/qpid/queue.py
@@ -42,6 +42,9 @@ class Queue(BaseQueue):
def close(self, error = None):
self.error = error
self.put(Queue.END)
+ if self.thread is not None:
+ self.thread.join()
+ self.thread = None
def get(self, block = True, timeout = None):
result = BaseQueue.get(self, block, timeout)