From 7ea774cefb7e5fca499ae514e09a2a6b6dd199f8 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Thu, 3 Sep 2009 19:39:07 +0000 Subject: removed final use of catchup git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@811088 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/messaging.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'python') diff --git a/python/qpid/messaging.py b/python/qpid/messaging.py index 0d05f5cc1c..2bf822b4c8 100644 --- a/python/qpid/messaging.py +++ b/python/qpid/messaging.py @@ -128,11 +128,6 @@ class Connection: 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 @@ class Session: 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 @@ class Session: 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 @@ class Sender: 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 @@ class Receiver: 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) -- cgit v1.2.1