From c6dd7ddb8f63aa0ab4abb6dbf0bf5dec2dc349ed Mon Sep 17 00:00:00 2001
From: Jonas Boner <jonas@jonasboner.com>
Date: Mon, 16 Aug 2010 11:43:27 +0200
Subject: [PATCH] minor edits

---
 akka-core/src/main/scala/actor/Actor.scala    | 30 +++++++++----------
 akka-core/src/main/scala/actor/ActorRef.scala | 10 +++----
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala
index 11451fb1a6..0e05901ce5 100644
--- a/akka-core/src/main/scala/actor/Actor.scala
+++ b/akka-core/src/main/scala/actor/Actor.scala
@@ -453,22 +453,20 @@ trait Actor extends Logging {
   private[akka] def apply(msg: Any) = processingBehavior(msg)
 
   private lazy val processingBehavior: Receive = {
-   lazy val defaultBehavior = receive
-
-   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
+    lazy val defaultBehavior = receive
+    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 e0c26a4bf7..6c15c197dd 100644
--- a/akka-core/src/main/scala/actor/ActorRef.scala
+++ b/akka-core/src/main/scala/actor/ActorRef.scala
@@ -24,13 +24,11 @@ import org.multiverse.api.exceptions.DeadTransactionException
 import java.net.InetSocketAddress
 import java.util.concurrent.locks.ReentrantLock
 import java.util.concurrent.atomic.AtomicReference
+import java.util.concurrent.{ScheduledFuture, ConcurrentHashMap, TimeUnit}
 import java.util.{Map => JMap}
 import java.lang.reflect.Field
 
-import jsr166x.{Deque, ConcurrentLinkedDeque}
-
 import com.google.protobuf.ByteString
-import java.util.concurrent.{ScheduledFuture, ConcurrentHashMap, TimeUnit}
 
 /**
  * ActorRef is an immutable and serializable handle to an Actor.
@@ -1191,8 +1189,8 @@ class LocalActorRef private[akka](
     // FIXME to fix supervisor restart of remote actor for oneway calls, inject a supervisor proxy that can send notification back to client
     _supervisor.foreach { sup =>
       if (sup.isShutdown) { // if supervisor is shut down, game over for all linked actors
-//        shutdownLinkedActors
-//        stop
+        shutdownLinkedActors
+        stop
       } else sup ! notification // else notify supervisor
     }
   }
@@ -1221,7 +1219,7 @@ class LocalActorRef private[akka](
   private def initializeActorInstance = {
     actor.init // run actor init and initTransactionalState callbacks
     actor.initTransactionalState
-    Actor.log.debug("[%s] has started", toString)
+    Actor.log.trace("[%s] has started", toString)
     ActorRegistry.register(this)
     if (id == "N/A") id = actorClass.getName // if no name set, then use default name (class name)
     clearTransactionSet // clear transaction set that might have been created if atomic block has been used within the Actor constructor body