summaryrefslogtreecommitdiff
path: root/qpid/java/common
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2008-10-14 13:41:36 +0000
committerRafael H. Schloming <rhs@apache.org>2008-10-14 13:41:36 +0000
commite3e59cf9466860c76b919d07bbcbd97d0139c5f7 (patch)
tree26de171d0ce8b8f29163a32417f58fa0e1b7de10 /qpid/java/common
parent5de65e50ef02f9e82301748cf042769932aeebec (diff)
downloadqpid-python-e3e59cf9466860c76b919d07bbcbd97d0139c5f7.tar.gz
QPID-1352: ignore duplicate detached controls
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@704537 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
index 06f80be6dd..e1b4705cc8 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
@@ -93,8 +93,11 @@ public abstract class ConnectionDelegate
@Override public void sessionDetached(Connection conn, SessionDetached dtc)
{
Session ssn = conn.getSession(dtc.getChannel());
- conn.unmap(ssn);
- ssn.closed();
+ if (ssn != null)
+ {
+ conn.unmap(ssn);
+ ssn.closed();
+ }
}
}