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) <christopher.l.shan...@gmail.com> Authored: Mon May 9 19:34:10 2016 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> 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