You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2013/07/18 22:04:45 UTC
svn commit: r1504626 - in
/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated:
ElectingLevelDBStore.scala MasterElector.scala
Author: chirino
Date: Thu Jul 18 20:04:45 2013
New Revision: 1504626
URL: http://svn.apache.org/r1504626
Log:
Adding a container property to the zk node data used by the leveldb replication.
Modified:
activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala
Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala?rev=1504626&r1=1504625&r2=1504626&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala (original)
+++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala Thu Jul 18 20:04:45 2013
@@ -76,6 +76,9 @@ class ElectingLevelDBStore extends Proxy
var brokerName: String = _
@BeanProperty
+ var container: String = _
+
+ @BeanProperty
var hostname: String = _
@BeanProperty
var bind = "tcp://0.0.0.0:61619"
Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala?rev=1504626&r1=1504625&r2=1504626&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala (original)
+++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala Thu Jul 18 20:04:45 2013
@@ -11,6 +11,9 @@ class LevelDBNodeState extends NodeState
var id: String = _
@JsonProperty
+ var container: String = _
+
+ @JsonProperty
var address: String = _
@JsonProperty
@@ -23,6 +26,7 @@ class LevelDBNodeState extends NodeState
obj match {
case x:LevelDBNodeState =>
x.id == id &&
+ x.container == container &&
x.address == address &&
x.position == position &&
x.elected == elected
@@ -73,6 +77,8 @@ class MasterElector(store: ElectingLevel
rc.elected = elected
rc.position = position
rc.address = address
+ rc.container = store.container
+ rc.address = address
rc
}