diff options
| author | Michael Goulish <mgoulish@apache.org> | 2012-01-25 20:20:28 +0000 |
|---|---|---|
| committer | Michael Goulish <mgoulish@apache.org> | 2012-01-25 20:20:28 +0000 |
| commit | f9ad7c6d6f7a568d449df9f731558206bbd81b8b (patch) | |
| tree | 873a6982b53b9732ff0a7e3afb57c3e9513baa5f /qpid/python | |
| parent | 960fd2b21449b7e9500a330bbdb90154305ac990 (diff) | |
| download | qpid-python-f9ad7c6d6f7a568d449df9f731558206bbd81b8b.tar.gz | |
Backing out change from rev 1235255.
This change broke these two tests:
qpid.tests.connection.ConnectionTest.testCloseGet
qpid.tests.connection.ConnectionTest.testCloseListen
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235906 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
| -rw-r--r-- | qpid/python/qpid/connection.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/qpid/python/qpid/connection.py b/qpid/python/qpid/connection.py index 53b7d8ff7e..7dbefb8778 100644 --- a/qpid/python/qpid/connection.py +++ b/qpid/python/qpid/connection.py @@ -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") |