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 3A70210CBF for ; Mon, 5 Jan 2015 21:01:49 +0000 (UTC) Received: (qmail 68043 invoked by uid 500); 5 Jan 2015 21:01:50 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 67993 invoked by uid 500); 5 Jan 2015 21:01:50 -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 67979 invoked by uid 99); 5 Jan 2015 21:01:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2015 21:01:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E1F5FA40724; Mon, 5 Jan 2015 21:01:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Date: Mon, 05 Jan 2015 21:01:49 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5506 - fix typo in leveldb attribute ZkSessionTmeout - now with the i, store.setZkSessionTimeout Repository: activemq Updated Branches: refs/heads/trunk 9ee7bbb0a -> 4d8489ba3 https://issues.apache.org/jira/browse/AMQ-5506 - fix typo in leveldb attribute ZkSessionTmeout - now with the i, store.setZkSessionTimeout Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4d8489ba Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4d8489ba Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4d8489ba Branch: refs/heads/trunk Commit: 4d8489ba386996b6172ce3dc6b0d0fca15f2f246 Parents: 5ebe71c Author: gtully Authored: Mon Jan 5 20:49:26 2015 +0000 Committer: gtully Committed: Mon Jan 5 21:00:45 2015 +0000 ---------------------------------------------------------------------- .../leveldb/replicated/ReplicatedLevelDBStoreViewMBean.java | 2 +- .../activemq/leveldb/replicated/ElectingLevelDBStore.scala | 6 +++--- .../activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/4d8489ba/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreViewMBean.java ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreViewMBean.java b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreViewMBean.java index 19b2192..9c81eb1 100644 --- a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreViewMBean.java +++ b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/ReplicatedLevelDBStoreViewMBean.java @@ -34,7 +34,7 @@ public interface ReplicatedLevelDBStoreViewMBean { @MBeanInfo("The path in ZooKeeper to hold master elections.") String getZkPath(); @MBeanInfo("The ZooKeeper session timeout.") - String getZkSessionTmeout(); + String getZkSessionTimeout(); @MBeanInfo("The address and port the master will bind for the replication protocol.") String getBind(); @MBeanInfo("The number of replication nodes that will be part of the replication cluster.") http://git-wip-us.apache.org/repos/asf/activemq/blob/4d8489ba/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 c64c9af..331d06b 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 @@ -69,7 +69,7 @@ class ElectingLevelDBStore extends ProxyLevelDBStore { @BeanProperty var zkPath = "/default" @BeanProperty - var zkSessionTmeout = "2s" + var zkSessionTimeout = "2s" var brokerName: String = _ @@ -181,7 +181,7 @@ class ElectingLevelDBStore extends ProxyLevelDBStore { log.close } - zk_client = new ZKClient(zkAddress, Timespan.parse(zkSessionTmeout), null) + zk_client = new ZKClient(zkAddress, Timespan.parse(zkSessionTimeout), null) if( zkPassword!=null ) { zk_client.setPassword(zkPassword) } @@ -415,7 +415,7 @@ class ReplicatedLevelDBStoreView(val store:ElectingLevelDBStore) extends Replica def getZkAddress = zkAddress def getZkPath = zkPath - def getZkSessionTmeout = zkSessionTmeout + def getZkSessionTimeout = zkSessionTimeout def getBind = bind def getReplicas = replicas http://git-wip-us.apache.org/repos/asf/activemq/blob/4d8489ba/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java index 3514930..4aeebfd 100644 --- a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java +++ b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java @@ -447,7 +447,7 @@ public class ReplicatedLevelDBBrokerTest extends ZooKeeperTestSupport { store.setContainer(id); store.setReplicas(3); store.setZkAddress("localhost:" + connector.getLocalPort()); - store.setZkSessionTmeout("15s"); + store.setZkSessionTimeout("15s"); store.setHostname("localhost"); store.setBind("tcp://0.0.0.0:0"); return store;