From e3e59cf9466860c76b919d07bbcbd97d0139c5f7 Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Tue, 14 Oct 2008 13:41:36 +0000
Subject: QPID-1352: ignore duplicate detached controls

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@704537 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/qpid/transport/ConnectionDelegate.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'qpid/java/common/src')

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();
+        }
     }
 
 }
-- 
cgit v1.2.1