From 248f1fe188fe2307b9dcf2c87a83b653eaa1920c Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Sat, 26 Dec 2009 12:42:57 +0000
Subject: synchronized with trunk except for ruby dir

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid.rnr@893970 13f79535-47bb-0310-9956-ffa450edef68
---
 python/qpid/queue.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'python/qpid/queue.py')

diff --git a/python/qpid/queue.py b/python/qpid/queue.py
index c9f4d1d1d0..63a7684843 100644
--- a/python/qpid/queue.py
+++ b/python/qpid/queue.py
@@ -63,7 +63,9 @@ class Queue(BaseQueue):
     if listener is None:
       if self.thread is not None:
         self.put(Queue.STOP)
-        self.thread.join()
+        # loop and timed join permit keyboard interrupts to work
+        while self.thread.isAlive():
+          self.thread.join(3)
         self.thread = None
 
     self.listener = listener
-- 
cgit v1.2.1