Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7EC3C200BB3 for ; Wed, 2 Nov 2016 17:46:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7D70F160AFB; Wed, 2 Nov 2016 16:46:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C1FF4160AF0 for ; Wed, 2 Nov 2016 17:46:15 +0100 (CET) Received: (qmail 11481 invoked by uid 500); 2 Nov 2016 16:46:15 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 11471 invoked by uid 99); 2 Nov 2016 16:46:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2016 16:46:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8DD6E0FA0; Wed, 2 Nov 2016 16:46:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: https://issues.apache.org/jira/browse/AMQ-6474 Date: Wed, 2 Nov 2016 16:46:14 +0000 (UTC) archived-at: Wed, 02 Nov 2016 16:46:16 -0000 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 Authored: Wed Nov 2 12:41:25 2016 -0400 Committer: Timothy Bish 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; + } } } }