diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala index db248eb025..11deb7166d 100644 --- a/akka-core/src/main/scala/actor/Actor.scala +++ b/akka-core/src/main/scala/actor/Actor.scala @@ -42,7 +42,7 @@ trait Transactor extends Actor { * * @author Jonas Bonér */ -abstract class RemoteActor(hostname: String, port: Int) extends Actor { +bstract class RemoteActor(hostname: String, port: Int) extends Actor { makeRemote(hostname, port) } diff --git a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala index 92627c8420..a81f94b53f 100644 --- a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala +++ b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala @@ -261,7 +261,7 @@ private [akka] object RedisStorageBackend extends } override def incrementByAtomically(name: String, by: Int): Option[Int] = withErrorHandling { - db.incrBy(new String(encode(name.getBytes)), by) match { + db.incrby(new String(encode(name.getBytes)), by) match { case Some(i) => Some(i) case None => throw new IllegalArgumentException(name + " exception in incrby") @@ -277,7 +277,7 @@ private [akka] object RedisStorageBackend extends } override def decrementByAtomically(name: String, by: Int): Option[Int] = withErrorHandling { - db.decrBy(new String(encode(name.getBytes)), by) match { + db.decrby(new String(encode(name.getBytes)), by) match { case Some(i) => Some(i) case None => throw new IllegalArgumentException(name + " exception in decrby") @@ -390,7 +390,7 @@ private [akka] object RedisStorageBackend extends } } - def flushDB = withErrorHandling(db.flushDb) + def flushDB = withErrorHandling(db.flushdb) private def withErrorHandling[T](body: => T): T = { try { diff --git a/embedded-repo/com/redis/redisclient/1.2/redisclient-1.2.jar b/embedded-repo/com/redis/redisclient/1.2/redisclient-1.2.jar new file mode 100644 index 0000000000..91ff84b97c Binary files /dev/null and b/embedded-repo/com/redis/redisclient/1.2/redisclient-1.2.jar differ diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 0c9d2aae58..58acc1d29d 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -154,7 +154,7 @@ abstract class AkkaDefaults(info: ProjectInfo) extends DefaultProject(info) with val moduleName = projectPath.substring( projectPath.lastIndexOf(System.getProperty("file.separator")) + 1, projectPath.length) - // FIXME need to find out a way to grab these paths from the sbt system + // FIXME need to find out a way to grab these paths from the sbt system // binary val JAR_FILE_NAME = moduleName + "_%s-%s.jar".format(buildScalaVersion, version) @@ -328,7 +328,8 @@ class AkkaParent(info: ProjectInfo) extends AkkaDefaults(info) { } class AkkaRedisProject(info: ProjectInfo) extends AkkaDefaults(info) { - val redis = "com.redis" % "redisclient" % "2.8.0.Beta1-1.2-SNAPSHOT" % "compile" +// val redis = "com.redis" % "redisclient" % "2.8.0.Beta1-1.2-SNAPSHOT" % "compile" + val redis = "com.redis" % "redisclient" % "1.2" % "compile" override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil lazy val dist = deployTask(info, distPath) dependsOn(`package`, packageDocs, packageSrc) describedAs("Deploying") }