summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/qpid/peer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/qpid/peer.py b/python/qpid/peer.py
index b9dd4e466a..5cabf98236 100644
--- a/python/qpid/peer.py
+++ b/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()