svn commit: r577321 - /incubator/qpid/trunk/qpid/python/qpid/peer.py

[gs...@apache.org]

Author: gsim
Date: Wed Sep 19 07:47:48 2007
New Revision: 577321

URL: http://svn.apache.org/viewvc?rev=577321&view=rev
Log:
Fixed (il)logic in timeout management when waiting for completion.


Modified:
    incubator/qpid/trunk/qpid/python/qpid/peer.py

Modified: incubator/qpid/trunk/qpid/python/qpid/peer.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/peer.py?rev=577321&r1=577320&r2=577321&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/peer.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/peer.py Wed Sep 19 07:47:48 2007
@@ -434,8 +434,8 @@
       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()