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]]