You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2014/03/20 18:44:25 UTC
[14/29] git commit: AMQ-5005. Fix for scala plugin
AMQ-5005. Fix for scala plugin
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/06c568aa
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/06c568aa
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/06c568aa
Branch: refs/heads/activemq-5.9
Commit: 06c568aad44154021cae59f25734a607315b6a5a
Parents: 9587ebb
Author: Hadrian Zbarcea <hz...@gmail.com>
Authored: Thu Jan 30 15:43:19 2014 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Thu Mar 20 13:10:33 2014 -0400
----------------------------------------------------------------------
.../main/scala/org/apache/activemq/leveldb/LevelDBClient.scala | 2 +-
.../activemq/leveldb/replicated/groups/ClusteredSingleton.scala | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/06c568aa/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
index 44f0d44..f69cb4c 100755
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
@@ -836,7 +836,7 @@ class LevelDBClient(store: LevelDBStore) {
private def logRefIncrement(pos: Long) {
for( key <- logRefKey(pos) ) {
- logRefs.getOrElseUpdate(key, new LongCounter()).incrementAndGet()
+ logRefs.getOrElseUpdate(key, new LongCounter(0)).incrementAndGet()
}
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/06c568aa/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala
index 18ef167..8b02458 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala
@@ -163,7 +163,8 @@ class ClusteredSingletonWatcher[T <: NodeState](val stateClass:Class[T]) extends
def masters = this.synchronized {
_members.mapValues(_.head._2).toArray.map(_._2).toArray(new ClassManifest[T] {
- def erasure = stateClass
+ def runtimeClass = stateClass
+ override def erasure = stateClass
})
}