summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Anthony Giusti <kgiusti@apache.org>2012-02-02 14:41:26 +0000
committerKenneth Anthony Giusti <kgiusti@apache.org>2012-02-02 14:41:26 +0000
commit3d0a790dad39e5ff832908315846bcaae05edb23 (patch)
tree2850588cd57475593667361a143fc0848db84f54
parentd7b6513c1379d6060ef78fe132c5472e8aac61ab (diff)
downloadqpid-python-3d0a790dad39e5ff832908315846bcaae05edb23.tar.gz
QPID-3798: do not wait indefinately for connection close.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239648 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/extras/qmf/src/py/qmf/console.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/extras/qmf/src/py/qmf/console.py b/qpid/extras/qmf/src/py/qmf/console.py
index e8be643c0f..0d72dc7609 100644
--- a/qpid/extras/qmf/src/py/qmf/console.py
+++ b/qpid/extras/qmf/src/py/qmf/console.py
@@ -2412,7 +2412,7 @@ class Broker(Thread):
try:
if self.conn:
- self.conn.close()
+ self.conn.close(5)
except:
pass
self.conn = None
@@ -2713,7 +2713,7 @@ class Broker(Thread):
self.amqpSession = None
try:
if self.conn:
- self.conn.close()
+ self.conn.close(_timeout)
except:
pass
self.conn = None