From e25ee9f0e21a4a52509dab44ae68898f8cb69cfa Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Wed, 12 Oct 2011 15:36:10 +0200
Subject: [PATCH] Fix remote main compile and testkit tests

---
 .../src/main/scala/akka/remote/RemoteActorRefProvider.scala   | 2 +-
 akka-testkit/src/main/scala/akka/testkit/TestKit.scala        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index d74fb2e045..119a84ca4c 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -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
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
index 2040ed6cd2..bdce4702a6 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
@@ -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)
   }
 
   /**