From 66e7155ef1b0bc397ee98f7c6531777b45c5eaf0 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Wed, 14 Dec 2011 16:35:40 +1300
Subject: [PATCH] Fix compilation error in typed actor

---
 akka-actor/src/main/scala/akka/actor/TypedActor.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index 04d4b1d098..e16d027fd8 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -313,7 +313,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
         case null ⇒
         case some ⇒
           some.actorVar.set(context.system.deadLetters) //Point it to the DLQ
-          proxyVar.set(null)
+          proxyVar.set(null.asInstanceOf[R])
       }
     }