diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index 2a3c57caaf..8fe21da757 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -158,9 +158,6 @@ trait ActorRef extends ActorRefShared with java.lang.Comparable[ActorRef] { scal def setLifeCycle(lifeCycle: LifeCycle): Unit def getLifeCycle(): LifeCycle - @volatile - private[akka] var _dispatcher: MessageDispatcher = Dispatchers.defaultGlobalDispatcher - /** * Akka Java API * The default dispatcher is the Dispatchers.globalExecutorBasedEventDrivenDispatcher. @@ -616,6 +613,8 @@ class LocalActorRef private[akka] ( private var restartsWithinTimeRangeTimestamp: Long = 0L @volatile private var _mailbox: AnyRef = _ + @volatile + private[akka] var _dispatcher: MessageDispatcher = Dispatchers.defaultGlobalDispatcher protected[akka] val actorInstance = guard.withGuard { new AtomicReference[Actor](newActor) }