Author: mgoulish
Date: Wed Jan 25 20:20:28 2012
New Revision: 1235906
URL: http://svn.apache.org/viewvc?rev=1235906&view=rev
Log:
Backing out change from rev 1235255.
This change broke these two tests:
qpid.tests.connection.ConnectionTest.testCloseGet
qpid.tests.connection.ConnectionTest.testCloseListen
Modified:
qpid/trunk/qpid/python/qpid/connection.py
Modified: qpid/trunk/qpid/python/qpid/connection.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/connection.py?rev=1235906&r1=1235905&r2=1235906&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/connection.py (original)
+++ qpid/trunk/qpid/python/qpid/connection.py Wed Jan 25 20:20:28 2012
@@ -161,12 +161,9 @@ class Connection(Framer):
data = self.sock.recv(64*1024)
if self.security_layer_rx and data:
status, data = self.security_layer_rx.decode(data)
- # zero-length data is OK, as long as return code is good.
- # when that happens, just keep trying. the sasl library
- # will send us data eventually. ( or an error code. )
- if not status:
- self.detach_all()
- break
+ if not data:
+ self.detach_all()
+ break
except socket.timeout:
if self.aborted():
self.close_code = (None, "connection timed out")
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
