From 656e65cffa70ccf978a00d6f9eac5ae6cee82040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= <jonasremove@jonasboner.com>
Date: Wed, 19 May 2010 21:08:02 +0200
Subject: [PATCH] Fixed problem with ordering when invoking self.start from
 within Actor

---
 akka-core/src/main/scala/actor/Actor.scala       |  3 ++-
 akka-core/src/main/scala/actor/ActorRef.scala    | 16 ++++++++++------
 ...torBasedEventDrivenDispatcherActorsSpec.scala |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala
index 8b4cb81836..256a6c1784 100644
--- a/akka-core/src/main/scala/actor/Actor.scala
+++ b/akka-core/src/main/scala/actor/Actor.scala
@@ -228,11 +228,12 @@ object Actor extends Logging {
   def spawn(body: => Unit): Unit = {
     case object Spawn
     actorOf(new Actor() {
+      self.start
       self ! Spawn
       def receive = {
         case Spawn => body; self.stop
       }
-    }).start
+    })
   }
 }
 
diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala
index 01da50c4b0..4c92b33df6 100644
--- a/akka-core/src/main/scala/actor/ActorRef.scala
+++ b/akka-core/src/main/scala/actor/ActorRef.scala
@@ -5,7 +5,7 @@
 package se.scalablesolutions.akka.actor
 
 import se.scalablesolutions.akka.dispatch._
-import se.scalablesolutions.akka.config.Config._
+import se.scalablesolutions.akka.config.Config.config
 import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
 import se.scalablesolutions.akka.config.ScalaConfig._
 import se.scalablesolutions.akka.stm.Transaction.Global._
@@ -716,6 +716,9 @@ sealed class LocalActorRef private[akka](
     if (isShutdown) throw new ActorStartException(
       "Can't restart an actor that has been shut down with 'stop' or 'exit'")
     if (!isRunning) {
+      dispatcher.register(this)
+      dispatcher.start
+      _isRunning = true
       if (!isInInitialization) initializeActorInstance
       else runActorInitialization = true
     }
@@ -979,7 +982,11 @@ sealed class LocalActorRef private[akka](
   /**
    * Callback for the dispatcher. E.g. single entry point to the user code and all protected[this] methods.
    */
-  protected[akka] def invoke(messageHandle: MessageInvocation) = actor.synchronized {
+  protected[akka] def invoke(messageHandle: MessageInvocation): Unit = actor.synchronized {
+    if (isShutdown) {
+      Actor.log.warning("Actor [%s] is shut down, ignoring message [%s]", toString, messageHandle)
+      return
+    }
     try {
       sender = messageHandle.sender
       senderFuture = messageHandle.senderFuture
@@ -1172,15 +1179,12 @@ sealed class LocalActorRef private[akka](
     }
   }
 
-  private def initializeActorInstance = if (!isRunning) {
-    dispatcher.register(this)
-    dispatcher.start
+  private def initializeActorInstance = {
     actor.init // run actor init and initTransactionalState callbacks
     actor.initTransactionalState
     Actor.log.debug("[%s] has started", toString)
     ActorRegistry.register(this)
     if (id == "N/A") id = actorClass.getName // if no name set, then use default name (class name)
-    _isRunning = true
   }
 
   private def serializeMessage(message: AnyRef): AnyRef = if (Actor.SERIALIZE_MESSAGES) {
diff --git a/akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorsSpec.scala b/akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorsSpec.scala
index efd6831662..563dcf9262 100644
--- a/akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorsSpec.scala
+++ b/akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorsSpec.scala
@@ -14,7 +14,6 @@ import Actor._
  */
 class ExecutorBasedEventDrivenDispatcherActorsSpec extends JUnitSuite with MustMatchers {
   class SlowActor(finishedCounter: CountDownLatch) extends Actor {
-    self.dispatcher = Dispatchers.globalExecutorBasedEventDrivenDispatcher
     self.id = "SlowActor"
 
     def receive = {
@@ -26,7 +25,6 @@ class ExecutorBasedEventDrivenDispatcherActorsSpec extends JUnitSuite with MustM
   }
 
   class FastActor(finishedCounter: CountDownLatch) extends Actor {
-    self.dispatcher = Dispatchers.globalExecutorBasedEventDrivenDispatcher
     self.id = "FastActor"
 
     def receive = {
@@ -55,6 +53,8 @@ class ExecutorBasedEventDrivenDispatcherActorsSpec extends JUnitSuite with MustM
     // now assert that f is finished while s is still busy
     fFinished.await
     assert(sFinished.getCount > 0)
+    sFinished.await
+    assert(sFinished.getCount === 0)
     f.stop
     s.stop
   }