From e119bd4c78e853463a1a60deaecd95a39a45bf89 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 21 Nov 2010 15:24:33 +0100
Subject: [PATCH] Moving dispatcher volatile field from ActorRef to
 LocalActorRef

---
 akka-actor/src/main/scala/akka/actor/ActorRef.scala | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 <tt>Dispatchers.globalExecutorBasedEventDrivenDispatcher</tt>.
@@ -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) }