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 136492004C8 for ; Mon, 9 May 2016 21:36:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 103531609A8; Mon, 9 May 2016 19:36:02 +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 58EAE16099C for ; Mon, 9 May 2016 21:36:01 +0200 (CEST) Received: (qmail 90874 invoked by uid 500); 9 May 2016 19:36:00 -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 90865 invoked by uid 99); 9 May 2016 19:36:00 -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; Mon, 09 May 2016 19:36:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 722DEDFBD6; Mon, 9 May 2016 19:36:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cshannon@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-6285 Date: Mon, 9 May 2016 19:36:00 +0000 (UTC) archived-at: Mon, 09 May 2016 19:36:02 -0000 Repository: activemq Updated Branches: refs/heads/master 100c5e0b5 -> 91213010b https://issues.apache.org/jira/browse/AMQ-6285 Added an extra isShutdown() failsafe check when detecting if the checkpoint thread should start Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/91213010 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/91213010 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/91213010 Branch: refs/heads/master Commit: 91213010b30d426095c16d3fa8d5fa2cafaf05e5 Parents: 100c5e0 Author: Christopher L. Shannon (cshannon) Authored: Mon May 9 19:34:10 2016 +0000 Committer: Christopher L. Shannon (cshannon) Committed: Mon May 9 19:35:02 2016 +0000 ---------------------------------------------------------------------- .../java/org/apache/activemq/store/kahadb/MessageDatabase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/91213010/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java ---------------------------------------------------------------------- diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java index ffa60ff..a3addcc 100644 --- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java +++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java @@ -354,7 +354,7 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe return; } synchronized (schedulerLock) { - if (scheduler == null) { + if (scheduler == null || scheduler.isShutdown()) { scheduler = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() { @Override