Updated Branches: refs/heads/trunk 69e6ad8cf -> d36e3c0e9
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/d36e3c0e Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d36e3c0e Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d36e3c0e Branch: refs/heads/trunk Commit: d36e3c0e952643eccdfdf075d32dbf41eeb2aa71 Parents: 69e6ad8 Author: Hadrian Zbarcea <hzbar...@gmail.com> Authored: Thu Jan 30 15:43:19 2014 -0500 Committer: Hadrian Zbarcea <hzbar...@gmail.com> Committed: Thu Jan 30 15:43:45 2014 -0500 ---------------------------------------------------------------------- .../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/d36e3c0e/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/d36e3c0e/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 }) }
