From 612fe8ab5b8df4ba91604e85549d594ccf78d45b Mon Sep 17 00:00:00 2001 From: Pavel Moravec Date: Tue, 22 Oct 2013 14:30:42 +0000 Subject: QPID-5203 Python client unexpected exception after ACL denial git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1534643 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/qpid/messaging/endpoints.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'qpid/python') diff --git a/qpid/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py index 6f0e9432dc..d686f0dd77 100644 --- a/qpid/python/qpid/messaging/endpoints.py +++ b/qpid/python/qpid/messaging/endpoints.py @@ -750,6 +750,7 @@ class Session(Endpoint): """ Close the session. """ + self.error = None self.sync(timeout=timeout) for link in self.receivers + self.senders: @@ -920,8 +921,9 @@ class Sender(Endpoint): self._wakeup() try: - if not self.session._ewait(lambda: self.closed, timeout=timeout): - raise Timeout("sender close timed out") + if not self.session.closed: + if not self.session._ewait(lambda: self.closed, timeout=timeout): + raise Timeout("sender close timed out") finally: try: self.session.senders.remove(self) @@ -1067,8 +1069,9 @@ class Receiver(Endpoint, object): self._wakeup() try: - if not self.session._ewait(lambda: self.closed, timeout=timeout): - raise Timeout("receiver close timed out") + if not self.session.closed: + if not self.session._ewait(lambda: self.closed, timeout=timeout): + raise Timeout("receiver close timed out") finally: try: self.session.receivers.remove(self) -- cgit v1.2.1