raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Fix remote main compile and testkit tests

Browse source
This commit is contained in:
Peter Vlugter 2011-10-12 15:36:10 +02:00
parent e2f9528bc0
commit e25ee9f0e2
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
View file

@ -46,7 +46,7 @@ class RemoteActorRefProvider(val app: AkkaApplication, val remote: Remote) exten
if (oldFuture eq null) { // we won the race -- create the actor and resolve the future
val actor = try {
app.deployer.lookupDeploymentFor(address) match {
case Some(Deploy(_, _, router, nrOfInstances, _, app.deployment.RemoteScope(remoteAddresses))) ⇒
case Some(Deploy(_, _, router, nrOfInstances, _, app.deployer.deploymentConfig.RemoteScope(remoteAddresses))) ⇒
val thisHostname = remote.address.getHostName
val thisPort = remote.address.getPort

4
akka-testkit/src/main/scala/akka/testkit/TestKit.scala
View file

@ -230,7 +230,7 @@ class TestKit(_app: AkkaApplication) {
* means reception of the message as part of an expect... or receive... call,
* not reception by the testActor.
*/
def reply(msg: AnyRef) { lastMessage.channel ! msg }
def reply(msg: AnyRef) { lastMessage.channel.!(msg)(testActor) }
/**
* Same as `expectMsg(remaining, obj)`, but correctly treating the timeFactor.
@ -558,7 +558,7 @@ class TestProbe(_application: AkkaApplication) extends TestKit(_application) {
* methods.
*/
def send(actor: ActorRef, msg: AnyRef) = {
actor ! msg
actor.!(msg)(testActor)
}
/**