Attachment 1028385 Details for Bug 1181005 – Check to see if channel is associated with a session before using it

[patch] Check to see if channel is associated with a session before using it

bz1181005.patch (text/plain), 1.17 KB, created by Ernie on 2015-05-21 19:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ernie

Created: 2015-05-21 19:50:09 UTC

Size: 1.17 KB

patch

obsolete

>diff --git a/qpid/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
>index 7c30e5d..4f48568 100644
>--- a/qpid/python/qpid/messaging/driver.py
>+++ b/qpid/python/qpid/messaging/driver.py
>@@ -897,10 +897,13 @@ class Engine:
>     return self._sessions[op.channel]
> 
>   def do_session_detached(self, dtc):
>-    sst = self._sessions.pop(dtc.channel)
>-    ssn = sst.session
>-    del self._attachments[ssn]
>-    ssn.closed = True
>+    if dtc.channel in self._sessions:
>+      sst = self._sessions.pop(dtc.channel)
>+      ssn = sst.session
>+      del self._attachments[ssn]
>+      ssn.closed = True
>+    else:
>+      self.close(ConnectError(text="Session detached after channel exception"))
> 
>   def do_session_detach(self, dtc):
>     sst = self.get_sst(dtc)
>diff --git a/qpid/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py
>index 2797677..26d0278 100644
>--- a/qpid/python/qpid/messaging/endpoints.py
>+++ b/qpid/python/qpid/messaging/endpoints.py
>@@ -788,6 +788,7 @@ class Session(Endpoint):
>     Close the session.
>     """
>     if self.error: return
>+    if self.closed: return
>     self.sync(timeout=timeout)
> 
>     for link in self.receivers + self.senders:

Actions: View | Diff

Attachments on bug 1181005: 1028385 | 1028876 | 1037366