Author: rhs
Date: Thu Sep 3 19:39:07 2009
New Revision: 811088
URL: http://svn.apache.org/viewvc?rev=811088&view=rev
Log:
removed final use of catchup
Modified:
qpid/trunk/qpid/python/qpid/messaging.py
Modified: qpid/trunk/qpid/python/qpid/messaging.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging.py?rev=811088&r1=811087&r2=811088&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging.py Thu Sep 3 19:39:07 2009
@@ -128,11 +128,6 @@
self._modcount += 1
self._driver.wakeup()
- def _catchup(self, exc=ConnectionError):
- mc = self._modcount
- self._wait(lambda: not self._driver._modcount < mc)
- self._check_error(exc)
-
def _check_error(self, exc=ConnectionError):
if self.error:
raise exc(*self.error)
@@ -304,9 +299,6 @@
def _wakeup(self):
self.connection._wakeup()
- def _catchup(self, exc=SessionError):
- self.connection._catchup(exc)
-
def _check_error(self, exc=SessionError):
self.connection._check_error(exc)
@@ -491,8 +483,7 @@
self.closing = True
self._wakeup()
- self._catchup()
- self._wait(lambda: self.closed)
+ self._ewait(lambda: self.closed)
while self.thread.isAlive():
self.thread.join(3)
self.thread = None
@@ -525,9 +516,6 @@
def _wakeup(self):
self.session._wakeup()
- def _catchup(self, exc=SendError):
- self.session._catchup(exc)
-
def _check_error(self, exc=SendError):
self.session._check_error(exc)
@@ -642,9 +630,6 @@
def _wakeup(self):
self.session._wakeup()
- def _catchup(self, exc=ReceiveError):
- self.session._catchup()
-
def _check_error(self, exc=ReceiveError):
self.session._check_error(exc)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
