You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2013/10/30 11:08:57 UTC
svn commit: r1537030 - /qpid/trunk/qpid/python/qpid/messaging/endpoints.py
Author: gsim
Date: Wed Oct 30 10:08:56 2013
New Revision: 1537030
URL: http://svn.apache.org/r1537030
Log:
QPID-5203: if session error exists, simply return from session close (also reverts previous fix)
Modified:
qpid/trunk/qpid/python/qpid/messaging/endpoints.py
Modified: qpid/trunk/qpid/python/qpid/messaging/endpoints.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging/endpoints.py?rev=1537030&r1=1537029&r2=1537030&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging/endpoints.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging/endpoints.py Wed Oct 30 10:08:56 2013
@@ -750,7 +750,7 @@ class Session(Endpoint):
"""
Close the session.
"""
- self.error = None
+ if self.error: return
self.sync(timeout=timeout)
for link in self.receivers + self.senders:
@@ -921,9 +921,8 @@ class Sender(Endpoint):
self._wakeup()
try:
- if not self.session.closed:
- if not self.session._ewait(lambda: self.closed, timeout=timeout):
- raise Timeout("sender close timed out")
+ if not self.session._ewait(lambda: self.closed, timeout=timeout):
+ raise Timeout("sender close timed out")
finally:
try:
self.session.senders.remove(self)
@@ -1069,9 +1068,8 @@ class Receiver(Endpoint, object):
self._wakeup()
try:
- if not self.session.closed:
- if not self.session._ewait(lambda: self.closed, timeout=timeout):
- raise Timeout("receiver close timed out")
+ if not self.session._ewait(lambda: self.closed, timeout=timeout):
+ raise Timeout("receiver close timed out")
finally:
try:
self.session.receivers.remove(self)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org