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-6474
Date Wed, 02 Nov 2016 16:46:14 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 0c280fed6 -> 3642ab1c1


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

ASYNC_TASKS executor not being shut down on stop with no other users in
service.
(cherry picked from commit d1f42bd01e90abe3fb171834efd46a3594ba2600)


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

Branch: refs/heads/activemq-5.14.x
Commit: 3642ab1c1096fc84e2370c03a5507878ca658281
Parents: 0c280fe
Author: Timothy Bish <tabish121@gmail.com>
Authored: Wed Nov 2 12:41:25 2016 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Wed Nov 2 12:44:58 2016 -0400

----------------------------------------------------------------------
 .../apache/activemq/transport/AbstractInactivityMonitor.java   | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/3642ab1c/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;
+                    }
                 }
             }
         }


Mime
View raw message