You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2015/10/08 14:13:25 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-6004
Repository: activemq
Updated Branches:
refs/heads/master 6fef9eea6 -> 4adc8e4f4
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
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4adc8e4f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4adc8e4f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4adc8e4f
Branch: refs/heads/master
Commit: 4adc8e4f4e57a4335643f49c3072e5fd531c7f27
Parents: 6fef9ee
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Thu Oct 8 12:11:16 2015 +0000
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Thu Oct 8 12:11:16 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/4adc8e4f/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 5896e74..8431903 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
@@ -467,6 +467,10 @@ public class TcpTransportServer extends TransportServerThreadSupport implements
serverSocket.close();
serverSocket = null;
}
+ if (socketHandlerThread != null) {
+ socketHandlerThread.interrupt();
+ socketHandlerThread = null;
+ }
super.doStop(stopper);
}