From 01f313c25e8df158fc3cf792f29f2dfa5396aee4 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Tue, 10 Aug 2010 18:10:28 +0200
Subject: [PATCH] Performance optimization?

---
 akka-core/src/main/scala/actor/Actor.scala    | 33 +++++++++++--------
 akka-core/src/main/scala/actor/ActorRef.scala |  4 +--
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala
index 5e48523813..a5b0329d24 100644
--- a/akka-core/src/main/scala/actor/Actor.scala
+++ b/akka-core/src/main/scala/actor/Actor.scala
@@ -436,7 +436,7 @@ trait Actor extends Logging {
   /**
    * Is the actor able to handle the message passed in as arguments?
    */
-  def isDefinedAt(message: Any): Boolean = base.isDefinedAt(message)
+  def isDefinedAt(message: Any): Boolean = processingBehavior.isDefinedAt(message)
 
   /** One of the fundamental methods of the ActorsModel
    * Actor assumes a new behavior
@@ -449,21 +449,26 @@ trait Actor extends Logging {
   // =========================================
   // ==== INTERNAL IMPLEMENTATION DETAILS ====
   // =========================================
+  
+  private[akka] def apply(msg: Any) = processingBehavior(msg)
 
-  private[akka] def base: Receive = try {
-    lifeCycles orElse (self.hotswap getOrElse receive)
-  } catch {
-    case e: NullPointerException => throw new IllegalActorStateException(
-      "The 'self' ActorRef reference for [" + getClass.getName + "] is NULL, error in the ActorRef initialization process.")
-  }
+  private lazy val processingBehavior: Receive = {
+   lazy val defaultBehavior = receive
 
-  private val lifeCycles: Receive = {
-    case HotSwap(code)        => become(code)
-    case Exit(dead, reason)   => self.handleTrapExit(dead, reason)
-    case Link(child)          => self.link(child)
-    case Unlink(child)        => self.unlink(child)
-    case UnlinkAndStop(child) => self.unlink(child); child.stop
-    case Restart(reason)      => throw reason
+   val actorBehavior: Receive = {
+    case HotSwap(code)                 => become(code)
+    case Exit(dead, reason)            => self.handleTrapExit(dead, reason)
+    case Link(child)                   => self.link(child)
+    case Unlink(child)                 => self.unlink(child)
+    case UnlinkAndStop(child)          => self.unlink(child); child.stop
+    case Restart(reason)               => throw reason
+    case msg if self.hotswap.isDefined &&
+                self.hotswap.get.isDefinedAt(msg) => self.hotswap.get.apply(msg)
+    case msg if self.hotswap.isEmpty   &&
+                defaultBehavior.isDefinedAt(msg)  => defaultBehavior.apply(msg) 
+   }
+
+   actorBehavior
   }
 }
 
diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala
index f8f9ddda14..333b21bd9e 100644
--- a/akka-core/src/main/scala/actor/ActorRef.scala
+++ b/akka-core/src/main/scala/actor/ActorRef.scala
@@ -1132,11 +1132,11 @@ class LocalActorRef private[akka](
       if (isTransactor) {
         val txFactory = _transactionFactory.getOrElse(DefaultGlobalTransactionFactory)
         atomic(txFactory) {
-          actor.base(message)
+          actor(message)
           setTransactionSet(txSet) // restore transaction set to allow atomic block to do commit
         }
       } else {
-        actor.base(message)
+        actor(message)
         setTransactionSet(txSet) // restore transaction set to allow atomic block to do commit
       }
     } catch {