From ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 21 Oct 2011 01:19:00 +0000 Subject: Undo bad merge from trunk - merged at wrong level. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/messaging/endpoints.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'python/qpid/messaging/endpoints.py') diff --git a/python/qpid/messaging/endpoints.py b/python/qpid/messaging/endpoints.py index 338ac70ecf..b8101b76e6 100644 --- a/python/qpid/messaging/endpoints.py +++ b/python/qpid/messaging/endpoints.py @@ -158,7 +158,6 @@ class Connection(Endpoint): self.reconnect_log = options.get("reconnect_log", True) self.address_ttl = options.get("address_ttl", 60) - self.tcp_nodelay = options.get("tcp_nodelay", False) self.options = options @@ -198,7 +197,7 @@ class Connection(Endpoint): return result def check_closed(self): - if not self._connected: + if self.closed: self._condition.gc() raise ConnectionClosed() @@ -1007,9 +1006,9 @@ class Receiver(Endpoint, object): self.draining = True self._wakeup() self._ecwait(lambda: not self.draining) - msg = self.session._get(self, timeout=0) self._grant() self._wakeup() + msg = self.session._get(self, timeout=0) if msg is None: raise Empty() elif self._capacity not in (0, UNLIMITED.value): -- cgit v1.2.1