Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3A3F517DF7 for ; Wed, 1 Apr 2015 14:38:20 +0000 (UTC) Received: (qmail 53585 invoked by uid 500); 1 Apr 2015 14:37:12 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 53507 invoked by uid 500); 1 Apr 2015 14:37:12 -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 53471 invoked by uid 99); 1 Apr 2015 14:37:12 -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, 01 Apr 2015 14:37:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1EC9FE05DF; Wed, 1 Apr 2015 14:37:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ceposta@apache.org To: commits@activemq.apache.org Message-Id: <2c9e6a9ba7254beab387b5f53efb5fc8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: fix the inconsistency with ElectingLevelDBStore.isMaster() under AMQ-5082 unit test conditions Date: Wed, 1 Apr 2015 14:37:12 +0000 (UTC) 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 Authored: Tue Mar 31 19:51:15 2015 -0700 Committer: Christian Posta 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(^{