Attachment 1284486 Details for Bug 1444206 – Proposed fix

[patch] Proposed fix

BZ1444206.patch (text/plain), 1.82 KB, created by Kim van der Riet on 2017-06-02 16:45:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kim van der Riet

Created: 2017-06-02 16:45:08 UTC

Size: 1.82 KB

patch

obsolete

>diff --git a/qpid/messaging/driver.py b/qpid/messaging/driver.py
>index 146b818..4692144 100644
>--- a/qpid/messaging/driver.py
>+++ b/qpid/messaging/driver.py
>@@ -402,6 +402,7 @@ class Driver:
>     waiting for output bandwidth (call the self.writeable() callback)
>     """
>     return self._transport is not None and \
>+        self.engine is not None and \
>         self._transport.writing(self.engine.pending())
> 
>   @synchronized
>@@ -431,7 +432,7 @@ class Driver:
>     reconnect the transport, declare the reconnect ok, then fail again after 2
>     missed heartbeats and so on.
>     """
>-    if self._retrying and self.engine._connected: # Means we have received open-ok.
>+    if self._retrying and self.engine is not None and self.engine._connected: # Means we have received open-ok.
>       if self._reconnect_log:
>         log.warn("reconnect succeeded: %s:%s", *self._last_host)
>       self._next_retry = None
>@@ -441,6 +442,8 @@ class Driver:
> 
>   @synchronized
>   def readable(self):
>+    if self.engine is None:
>+      return
>     try:
>       data = self._transport.recv(64*1024)
>       if data is None:
>@@ -486,6 +489,7 @@ class Driver:
>       self.engine.close()
>     else:
>       self.engine.close(e)
>+    self.st_closed()
> 
>     self.schedule()
> 
>@@ -507,6 +511,8 @@ class Driver:
> 
>   @synchronized
>   def writeable(self):
>+    if self.engine is None:
>+      return
>     notify = False
>     try:
>       n = self._transport.send(self.engine.peek())
>@@ -543,9 +549,10 @@ class Driver:
>       if self._transport is None:
>         if self.connection._connected and not self.connection.error:
>           self.connect()
>-      else:
>+      elif self.engine is not None:
>         self.engine.dispatch()
>     except HeartbeatTimeout, e:
>+      log.warn("Heartbeat timeout")
>       self.close_engine(e)
>     except ContentError, e:
>       msg = compat.format_exc()

Actions: View | Diff

Attachments on bug 1444206: 1284486