You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2016/11/02 16:44:24 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-6474
Repository: activemq
Updated Branches:
refs/heads/master 4c8d30d07 -> d1f42bd01
https://issues.apache.org/jira/browse/AMQ-6474
ASYNC_TASKS executor not being shut down on stop with no other users in
service.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/d1f42bd0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d1f42bd0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d1f42bd0
Branch: refs/heads/master
Commit: d1f42bd01e90abe3fb171834efd46a3594ba2600
Parents: 4c8d30d
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Nov 2 12:41:25 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Nov 2 12:41:49 2016 -0400
----------------------------------------------------------------------
.../apache/activemq/transport/AbstractInactivityMonitor.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/d1f42bd0/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java b/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
index 7bd19c4..fa46a0e 100644
--- a/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
@@ -30,6 +30,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.activemq.command.KeepAliveInfo;
import org.apache.activemq.command.WireFormatInfo;
import org.apache.activemq.thread.SchedulerTimerTask;
+import org.apache.activemq.util.ThreadPoolUtils;
import org.apache.activemq.wireformat.WireFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -499,6 +500,11 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
READ_CHECK_TIMER.cancel();
WRITE_CHECK_TIMER = null;
READ_CHECK_TIMER = null;
+ try {
+ ThreadPoolUtils.shutdownGraceful(ASYNC_TASKS, TimeUnit.SECONDS.toMillis(10));
+ } finally {
+ ASYNC_TASKS = null;
+ }
}
}
}