Author: kgiusti
Date: Thu May 29 18:16:14 2014
New Revision: 1598353
URL: http://svn.apache.org/r1598353
Log:
QPID-5773: back out non-functional recv path change from QPID-4872
Modified:
qpid/trunk/qpid/python/qpid/messaging/transports.py
Modified: qpid/trunk/qpid/python/qpid/messaging/transports.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging/transports.py?rev=1598353&r1=1598352&r2=1598353&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging/transports.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging/transports.py Thu May 29 18:16:14 2014
@@ -139,11 +139,10 @@ else:
self.socket.setblocking(0)
self.state = None
- # See qpid-4872: need to store the parameters last passed to
- # tls.recv_into() and tls.write() in case the calls fail with an
- # SSL_ERROR_WANT_* error and we have to retry the call.
+ # See qpid-4872: need to store the parameters last passed to tls.write()
+ # in case the calls fail with an SSL_ERROR_WANT_* error and we have to
+ # retry the call with the same parameters.
self.write_retry = None # buffer passed to last call of tls.write()
- self.read_retry = None # buffer passed to last call of tls.recv_into()
def reading(self, reading):
if self.state is None:
@@ -176,23 +175,15 @@ else:
raise
def recv(self, n):
- if self.read_retry == None:
- self.read_retry = bytearray( n )
self._clear_state()
try:
- n = self.tls.recv_into( self.read_retry )
- r = str(self.read_retry[:n])
- self.read_retry = None
- return r
+ return self.tls.read(n)
except SSLError, e:
if self._update_state(e.args[0]):
- # will retry on next invokation
+ # will retry later:
return None
- self.read_retry = None
- raise
- except:
- self.read_retry = None
- raise
+ else:
+ raise
def _clear_state(self):
self.state = None
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
