From cc849e74406e6fdc410aac862bd615b9a321bb7f Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Fri, 13 May 2016 11:31:15 -0400 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-6291 Simplify the selector close in doStop, the run method no longer tries to close this after it has been registered and assigned. --- .../org/apache/activemq/transport/tcp/TcpTransportServer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java index 33d9c72da9..5d623b6264 100755 --- a/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java +++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java @@ -501,10 +501,9 @@ public class TcpTransportServer extends TransportServerThreadSupport implements Exception firstFailure = null; try { - final Selector selector = this.selector; if (selector != null) { - this.selector = null; selector.close(); + selector = null; } } catch (Exception error) { }