You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2010/07/15 12:18:02 UTC
svn commit: r964367 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java
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);
}
}