activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6291
Date Fri, 13 May 2016 15:31:24 GMT
Repository: activemq
Updated Branches:
  refs/heads/master ff9987226 -> cc849e744


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.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/cc849e74
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/cc849e74
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/cc849e74

Branch: refs/heads/master
Commit: cc849e74406e6fdc410aac862bd615b9a321bb7f
Parents: ff99872
Author: Timothy Bish <tabish121@gmail.com>
Authored: Fri May 13 11:31:15 2016 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Fri May 13 11:31:15 2016 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/transport/tcp/TcpTransportServer.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/cc849e74/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
----------------------------------------------------------------------
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 33d9c72..5d623b6 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) {
         }


Mime
View raw message