activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6004
Date Thu, 08 Oct 2015 12:14:23 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.12.x 503b62c17 -> a0d8a1546


https://issues.apache.org/jira/browse/AMQ-6004

Calling socketHandlerThread.interrupt() on TcpTransportServer stop to
make sure the broker shutsdown cleanly.

Patch applied with thanks to Erik Godding Boye

(cherry picked from commit 4adc8e4f4e57a4335643f49c3072e5fd531c7f27)


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

Branch: refs/heads/activemq-5.12.x
Commit: a0d8a15465eccec04e1273acfb7594f042ffdf46
Parents: 503b62c
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Thu Oct 8 12:11:16 2015 +0000
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Thu Oct 8 12:14:06 2015 +0000

----------------------------------------------------------------------
 .../org/apache/activemq/transport/tcp/TcpTransportServer.java    | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/a0d8a154/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 a0778cd..2c0c6a3 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
@@ -466,6 +466,10 @@ public class TcpTransportServer extends TransportServerThreadSupport
implements
             serverSocket.close();
             serverSocket = null;
         }
+        if (socketHandlerThread != null) {
+            socketHandlerThread.interrupt();
+            socketHandlerThread = null;
+        }
         super.doStop(stopper);
     }
 


Mime
View raw message