You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ce...@apache.org on 2015/04/01 16:37:12 UTC

activemq git commit: fix the inconsistency with ElectingLevelDBStore.isMaster() under AMQ-5082 unit test conditions

Repository: activemq
Updated Branches:
  refs/heads/master 3d6bb7c39 -> a6243225c


fix the inconsistency with ElectingLevelDBStore.isMaster() under AMQ-5082 unit test conditions


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

Branch: refs/heads/master
Commit: a6243225c5be2f8eaa7121e9616315e1b5661483
Parents: 3d6bb7c
Author: James A. Robinson <ji...@highwire.org>
Authored: Tue Mar 31 19:51:15 2015 -0700
Committer: Christian Posta <ch...@gmail.com>
Committed: Wed Apr 1 07:36:52 2015 -0700

----------------------------------------------------------------------
 .../apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala   | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/a6243225/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
index 331d06b..a47baab 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
@@ -228,6 +228,7 @@ class ElectingLevelDBStore extends ProxyLevelDBStore {
     master_started.set(true)
     master.blocking_executor.execute(^{
       master.start();
+      master_stopped.set(false)
       master_started_latch.countDown()
     })
     master.blocking_executor.execute(^{