activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r964367 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java
Date Thu, 15 Jul 2010 10:18:02 GMT
Author: gtully
Date: Thu Jul 15 10:18:02 2010
New Revision: 964367

URL: http://svn.apache.org/viewvc?rev=964367&view=rev
Log:
resolve NPE on stop when reconnect fails - resolve https://issues.apache.org/activemq/browse/AMQ-2811

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java?rev=964367&r1=964366&r2=964367&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java
Thu Jul 15 10:18:02 2010
@@ -150,7 +150,9 @@ public class NIOTransport extends TcpTra
     }
 
     protected void doStop(ServiceStopper stopper) throws Exception {
-        selection.close();
+        if (selection != null) {
+            selection.close();
+        }
         super.doStop(stopper);
     }
 }



Mime
View raw message