From a73e9933c4db5d89f89f583cdb8ce38121c47eec Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Fri, 8 Oct 2010 15:59:10 +0200
Subject: [PATCH] Removing isInInitialization, reading that from
 actorRefInCreation, -1 volatile field per actorref

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

diff --git a/akka-actor/src/main/scala/actor/ActorRef.scala b/akka-actor/src/main/scala/actor/ActorRef.scala
index eefcccced6..4382d78d5c 100644
--- a/akka-actor/src/main/scala/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/actor/ActorRef.scala
@@ -642,8 +642,6 @@ class LocalActorRef private[akka] (
   @volatile
   private[akka] var _supervisor: Option[ActorRef] = None
   @volatile
-  private var isInInitialization = false
-  @volatile
   private var maxNrOfRetriesCount: Int = 0
   @volatile
   private var restartsWithinTimeRangeTimestamp: Long = 0L
@@ -791,7 +789,8 @@ class LocalActorRef private[akka] (
       }
       _status = ActorRefStatus.RUNNING
 
-      if (!isInInitialization) initializeActorInstance
+      //If actorRefInCreation is empty, we're outside creation of the actor, and so we can initialize the actor instance.
+      if (Actor.actorRefInCreation.value.isEmpty) initializeActorInstance
 
       checkReceiveTimeout //Schedule the initial Receive timeout
     }
@@ -1128,7 +1127,6 @@ class LocalActorRef private[akka] (
 
   private[this] def newActor: Actor = {
     Actor.actorRefInCreation.withValue(Some(this)) {
-      isInInitialization = true
       val actor = actorFactory match {
         case Left(Some(clazz)) =>
           import ReflectiveAccess.{ createInstance, noParams, noArgs }
@@ -1146,7 +1144,6 @@ class LocalActorRef private[akka] (
       }
       if (actor eq null) throw new ActorInitializationException(
         "Actor instance passed to ActorRef can not be 'null'")
-      isInInitialization = false
       actor
     }
   }