Author: kwall
Date: Thu Feb 18 18:48:09 2016
New Revision: 1731110

URL: http://svn.apache.org/viewvc?rev=1731110&view=rev
Log:
QPID-7001: [Java Broker] Ensure that selection keys are cancelled/attachment 
removed when the connection is closed.

Modified:
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1731110&r1=1731109&r2=1731110&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
 Thu Feb 18 18:48:09 2016
@@ -369,7 +369,18 @@ public class NonBlockingConnection imple
         {
             try
             {
-                _socketChannel.close();
+                try
+                {
+                    NetworkConnectionScheduler scheduler = getScheduler();
+                    if (scheduler != null)
+                    {
+                        scheduler.removeConnection(this);
+                    }
+                }
+                finally
+                {
+                    _socketChannel.close();
+                }
             }
             catch (IOException e)
             {



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to