fixed screwed up merge

This commit is contained in:
jboner 2009-09-11 14:10:10 +02:00
parent 46cff1a0a1
commit adaab72d6e
3 changed files with 6 additions and 12 deletions

View file

@ -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 {

View file

@ -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
}