summaryrefslogtreecommitdiff
path: root/qpid/python
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2007-09-19 14:47:48 +0000
committerGordon Sim <gsim@apache.org>2007-09-19 14:47:48 +0000
commit84dc7855c13e29e6fbeb737c63f1495685455c30 (patch)
treec918cb946adcfc752193a4e8f20a6b2f61ce1acf /qpid/python
parente73a718ba9b590fbe8b5273c0aac266f4a937a9c (diff)
downloadqpid-python-84dc7855c13e29e6fbeb737c63f1495685455c30.tar.gz
Fixed (il)logic in timeout management when waiting for completion.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@577321 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
-rw-r--r--qpid/python/qpid/peer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/python/qpid/peer.py b/qpid/python/qpid/peer.py
index b9dd4e466a..5cabf98236 100644
--- a/qpid/python/qpid/peer.py
+++ b/qpid/python/qpid/peer.py
@@ -434,8 +434,8 @@ class OutgoingCompletion:
while not self.closed and point_of_interest > self.mark:
#print "waiting for ", point_of_interest, " mark is currently at ", self.mark
self.condition.wait(remaining)
- if timeout:
- if start_time + timeout > time(): break
+ if not self.closed and point_of_interest > self.mark and timeout:
+ if (start_time + timeout) < time(): break
else: remaining = timeout - (time() - start_time)
finally:
self.condition.release()