From d876887ed9dd616c5421fe87a6706c32d304a569 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Tue, 28 Sep 2010 14:08:23 +0200
Subject: [PATCH] =?UTF-8?q?Removing=20classloader=20field=20(volatile)=20f?=
 =?UTF-8?q?rom=20LocalActorRef,=20wasn=C2=B4t=20used?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 akka-actor/src/main/scala/actor/ActorRef.scala                 | 3 ---
 .../src/main/scala/serialization/SerializationProtocol.scala   | 1 -
 2 files changed, 4 deletions(-)

diff --git a/akka-actor/src/main/scala/actor/ActorRef.scala b/akka-actor/src/main/scala/actor/ActorRef.scala
index ed54c761b0..a61db83e4a 100644
--- a/akka-actor/src/main/scala/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/actor/ActorRef.scala
@@ -668,7 +668,6 @@ class LocalActorRef private[akka](
   @volatile private var isInInitialization = false
   @volatile private var runActorInitialization = false
   @volatile private var isDeserialized = false
-  @volatile private var loader: Option[ClassLoader] = None
   @volatile private var maxNrOfRetriesCount: Int = 0
   @volatile private var restartsWithinTimeRangeTimestamp: Long = 0L
   @volatile private var _mailbox: AnyRef = _
@@ -695,10 +694,8 @@ class LocalActorRef private[akka](
                          __lifeCycle: Option[LifeCycle],
                          __supervisor: Option[ActorRef],
                          __hotswap: Option[PartialFunction[Any, Unit]],
-                         __loader: ClassLoader,
                          __factory: () => Actor) = {
       this(__factory)
-      loader = Some(__loader)
       isDeserialized = true
       _uuid = __uuid
       id = __id
diff --git a/akka-remote/src/main/scala/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/serialization/SerializationProtocol.scala
index 9e047acdc3..5b881f5269 100644
--- a/akka-remote/src/main/scala/serialization/SerializationProtocol.scala
+++ b/akka-remote/src/main/scala/serialization/SerializationProtocol.scala
@@ -202,7 +202,6 @@ object ActorSerialization {
       lifeCycle,
       supervisor,
       hotswap,
-      classLoader, // TODO: should we fall back to getClass.getClassLoader?
       factory)
 
     val messages = protocol.getMessagesList.toArray.toList.asInstanceOf[List[RemoteRequestProtocol]]