From adaab72d6e489f99e2e7d776d3e5e6854caaa9ae Mon Sep 17 00:00:00 2001
From: jboner <jboner@darkstar.local>
Date: Fri, 11 Sep 2009 14:10:10 +0200
Subject: [PATCH] fixed screwed up merge

---
 akka-actors/src/main/scala/stm/TransactionalState.scala | 8 ++++----
 akka-persistence/src/main/scala/PersistentState.scala   | 6 ------
 akka-persistence/src/test/scala/AllTest.scala           | 4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/akka-actors/src/main/scala/stm/TransactionalState.scala b/akka-actors/src/main/scala/stm/TransactionalState.scala
index c671a72ea5..ddc18a61ef 100644
--- a/akka-actors/src/main/scala/stm/TransactionalState.scala
+++ b/akka-actors/src/main/scala/stm/TransactionalState.scala
@@ -91,7 +91,7 @@ class InMemoryTransactionalMap[K, V] extends TransactionalMap[K, V] {
     state.contains(key)
   }
 
-  override def clear = {
+  override def clear: Unit = {
     verifyTransaction
     state = new HashTrie[K, V]
   }
@@ -102,7 +102,7 @@ class InMemoryTransactionalMap[K, V] extends TransactionalMap[K, V] {
   }
 
   // ---- For scala.collection.mutable.Map ----
-  override def remove(key: K) = {
+  override def remove(key: K): Unit = {
     verifyTransaction
     state = state - key
   }
@@ -124,12 +124,12 @@ class InMemoryTransactionalMap[K, V] extends TransactionalMap[K, V] {
     oldValue
   }
 
-  override def -=(key: K) = {
+  override def -=(key: K): Unit = {
     verifyTransaction
     remove(key)
   }
 
-  override def update(key: K, value: V) = {
+  override def update(key: K, value: V): Unit = {
     verifyTransaction
     put(key, value)
   }
diff --git a/akka-persistence/src/main/scala/PersistentState.scala b/akka-persistence/src/main/scala/PersistentState.scala
index 8617f05c7e..75460cc47b 100644
--- a/akka-persistence/src/main/scala/PersistentState.scala
+++ b/akka-persistence/src/main/scala/PersistentState.scala
@@ -107,7 +107,6 @@ abstract class TemplatePersistentTransactionalMap extends PersistentTransactiona
   val storage: MapStorage
 
   override def remove(key: AnyRef) = {
-    verifyTransaction
     if (changeSet.contains(key)) changeSet -= key
     else storage.removeMapStorageFor(uuid, key)
   }
@@ -116,7 +115,6 @@ abstract class TemplatePersistentTransactionalMap extends PersistentTransactiona
     getRange(start, None, count)
 
   def getRange(start: Option[AnyRef], finish: Option[AnyRef], count: Int) = {
-    verifyTransaction
     try {
       storage.getMapStorageRangeFor(uuid, start, finish, count)
     } catch {
@@ -132,7 +130,6 @@ abstract class TemplatePersistentTransactionalMap extends PersistentTransactiona
 
   // ---- Overriding scala.collection.mutable.Map behavior ----
   override def clear = {
-    verifyTransaction
     try {
       storage.removeMapStorageFor(uuid)
     } catch {
@@ -142,7 +139,6 @@ abstract class TemplatePersistentTransactionalMap extends PersistentTransactiona
 
   override def contains(key: AnyRef): Boolean = {
     try {
-      verifyTransaction
       storage.getMapStorageEntryFor(uuid, key).isDefined
     } catch {
       case e: Exception => false
@@ -150,7 +146,6 @@ abstract class TemplatePersistentTransactionalMap extends PersistentTransactiona
   }
 
   override def size: Int = {
-    verifyTransaction
     try {
       storage.getMapStorageSizeFor(uuid)
     } catch {
@@ -160,7 +155,6 @@ abstract class TemplatePersistentTransactionalMap extends PersistentTransactiona
 
   // ---- For scala.collection.mutable.Map ----
   override def get(key: AnyRef): Option[AnyRef] = {
-    verifyTransaction
    // if (changeSet.contains(key)) changeSet.get(key)
    // else {
       val result = try {
diff --git a/akka-persistence/src/test/scala/AllTest.scala b/akka-persistence/src/test/scala/AllTest.scala
index 60374da92d..b73a6699ed 100644
--- a/akka-persistence/src/test/scala/AllTest.scala
+++ b/akka-persistence/src/test/scala/AllTest.scala
@@ -9,8 +9,8 @@ object AllTest extends TestCase {
   def suite(): Test = {
     val suite = new TestSuite("All Scala tests")
     //suite.addTestSuite(classOf[CassandraPersistentActorSpec])
-    //suite.addTestSuite(classOf[MongoPersistentActorSpec])
-    //suite.addTestSuite(classOf[MongoStorageSpec])
+    suite.addTestSuite(classOf[MongoPersistentActorSpec])
+    suite.addTestSuite(classOf[MongoStorageSpec])
     suite
   }