activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6285
Date Mon, 09 May 2016 19:36:25 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x cd68c42b9 -> 0ba9f9340


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

Added an extra isShutdown() failsafe check when detecting if the
checkpoint thread should start

(cherry picked from commit 91213010b30d426095c16d3fa8d5fa2cafaf05e5)


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

Branch: refs/heads/activemq-5.13.x
Commit: 0ba9f9340f3d568db54923e03b9abfb5a5352a38
Parents: cd68c42
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Mon May 9 19:34:10 2016 +0000
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Mon May 9 19:36:14 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/0ba9f934/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 d2bd8e3..24a2636 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
@@ -352,7 +352,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


Mime
View raw message