Merge remote-tracking branch 'origin/master' into wip-1685-remote-cleaup-∂π

This commit is contained in:
Roland 2012-01-26 11:24:23 +01:00
commit 52d6e5625d
432 changed files with 8354 additions and 2582 deletions

View file

@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
*/
package akka.remote
@ -7,6 +7,7 @@ import akka.testkit._
import akka.actor._
import com.typesafe.config._
import akka.dispatch.Await
import akka.pattern.ask
object RemoteCommunicationSpec {
class Echo extends Actor {
@ -81,8 +82,8 @@ akka {
"support ask" in {
Await.result(here ? "ping", timeout.duration) match {
case ("pong", s: AskActorRef) // good
case m fail(m + " was not (pong, AskActorRef)")
case ("pong", s: akka.pattern.AskSupport.PromiseActorRef) // good
case m fail(m + " was not (pong, AskActorRef)")
}
}