activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [2/2] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5506 - fix typo in leveldb attribute ZkSessionTmeout - now with the i, store.setZkSessionTimeout
Date Thu, 08 Jan 2015 23:55:42 GMT
https://issues.apache.org/jira/browse/AMQ-5506 - fix typo in leveldb attribute ZkSessionTmeout
- now with the i, store.setZkSessionTimeout

Conflicts:
	activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java


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

Branch: refs/heads/activemq-5.10.x
Commit: f613a355ed0e22d3b4a1219d7341a6571a3bf74a
Parents: 357a939
Author: gtully <gary.tully@gmail.com>
Authored: Mon Jan 5 20:49:26 2015 +0000
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Thu Jan 8 14:57:40 2015 -0500

----------------------------------------------------------------------
 .../leveldb/replicated/ReplicatedLevelDBStoreViewMBean.java    | 2 +-
 .../activemq/leveldb/replicated/ElectingLevelDBStore.scala     | 6 +++---
 .../activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/f613a355/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/f613a355/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 9a1852e..cec77b3 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 = _
 
@@ -177,7 +177,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)
     }
@@ -402,7 +402,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/f613a355/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 8910981..157b98a 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,6 +447,7 @@ public class ReplicatedLevelDBBrokerTest extends ZooKeeperTestSupport
{
         store.setContainer(id);
         store.setReplicas(3);
         store.setZkAddress("localhost:" + connector.getLocalPort());
+        store.setZkSessionTimeout("15s");
         store.setHostname("localhost");
         store.setBind("tcp://0.0.0.0:0");
         return store;


Mime
View raw message