From 02dbc4cbad108b86f9cd21949b7a7ca501a14052 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik_dot_nordwall@gmail>
Date: Tue, 12 Jul 2011 09:59:11 +0200
Subject: [PATCH] Ticket 1005: Changed WeakReference to lookup by uuid

---
 .../src/main/scala/akka/actor/Scheduler.scala       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
index 4096188a88..1451a34ada 100644
--- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala
+++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
@@ -18,7 +18,6 @@ package akka.actor
 import akka.event.EventHandler
 import akka.AkkaException
 import java.util.concurrent.atomic.AtomicLong
-import java.lang.ref.WeakReference
 import java.util.concurrent._
 import java.lang.RuntimeException
 
@@ -32,15 +31,15 @@ object Scheduler {
 
   private def createSendRunnable(receiver: ActorRef, message: Any, throwWhenReceiverExpired: Boolean): Runnable = {
     receiver match {
-      case local: LocalActorRef =>
-        val ref = new WeakReference[ActorRef](local)
+      case local: LocalActorRef ⇒
+        val uuid = local.uuid
         new Runnable {
-          def run = ref.get match {
-            case null => if(throwWhenReceiverExpired) throw new RuntimeException("Receiver not found: GC:ed")
-            case actor => actor ! message
+          def run = Actor.registry.local.actorFor(uuid) match {
+            case None        ⇒ if (throwWhenReceiverExpired) throw new RuntimeException("Receiver not found, unregistered")
+            case Some(actor) ⇒ actor ! message
           }
         }
-      case other => new Runnable { def run = other ! message }
+      case other ⇒ new Runnable { def run = other ! message }
     }
   }