Merge branch 'ticket955'

Conflicts: akka-actor-tests/src/test/scala/akka/actor/supervisor/Ticket669Spec.scala akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala
2011-07-19 16:56:44 -04:00 · 2011-07-19 16:56:44 -04:00 · 42769599aa
commit 42769599aa
parent df3d536b9c 5de2ca7aa5
21 changed files with 363 additions and 71 deletions
--- a/akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala
@ -251,7 +251,7 @@ object ConsumerScalaTest {
      case "succeed" ⇒ self.reply("ok")
    }

-    override def preRestart(reason: scala.Throwable) {
+    override def preRestart(reason: scala.Throwable, msg: Option[Any]) {
      self.tryReply("pr")
    }