QPID-1352: ignore duplicate detached controls

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@704537 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 2 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
index 06f80be6dd..e1b4705cc8 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
+++ b/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();
+        }
     }
 
 }