From 496fd331dbf3ee07db7f134a10acf21efc75b8ef Mon Sep 17 00:00:00 2001 From: Roland Date: Tue, 14 Aug 2012 15:41:07 +0200 Subject: [PATCH] review comments (Viktor), see #2376 --- akka-actor/src/main/resources/reference.conf | 2 +- akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala | 2 +- akka-actor/src/main/scala/akka/actor/FaultHandling.scala | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf index df89284993..2ab6b69b63 100644 --- a/akka-actor/src/main/resources/reference.conf +++ b/akka-actor/src/main/resources/reference.conf @@ -51,7 +51,7 @@ akka { provider = "akka.actor.LocalActorRefProvider" # The guardian "/user" will use this subclass of akka.actor.SupervisorStrategyConfigurator - # to obtain its supervisorstrategy. Besides the default there is + # to obtain its supervisorStrategy. Besides the default there is # akka.actor.StoppingSupervisorStrategy guardian-supervisor-strategy = "akka.actor.DefaultSupervisorStrategy" diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala index ae2955e11e..52cab34e63 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala @@ -411,7 +411,7 @@ class LocalActorRefProvider( */ def registerExtraNames(_extras: Map[String, InternalActorRef]): Unit = extraNames ++= _extras - private lazy val guardianSupervisorStrategyConfigurator = + private def guardianSupervisorStrategyConfigurator = dynamicAccess.createInstanceFor[SupervisorStrategyConfigurator](settings.SupervisorStrategyClass, Seq()).fold(throw _, x ⇒ x) /** diff --git a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala index 4d1bf7f046..9623c7eef7 100644 --- a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala +++ b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala @@ -70,11 +70,11 @@ trait SupervisorStrategyConfigurator { def create(): SupervisorStrategy } -class DefaultSupervisorStrategy extends SupervisorStrategyConfigurator { +final class DefaultSupervisorStrategy extends SupervisorStrategyConfigurator { override def create(): SupervisorStrategy = SupervisorStrategy.defaultStrategy } -class StoppingSupervisorStrategy extends SupervisorStrategyConfigurator { +final class StoppingSupervisorStrategy extends SupervisorStrategyConfigurator { override def create(): SupervisorStrategy = SupervisorStrategy.stoppingStrategy } @@ -156,7 +156,7 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { /** * This strategy resembles Erlang in that failing children are always - * terminated. + * terminated (one-for-one). */ final val stoppingStrategy: SupervisorStrategy = { def stoppingDecider: Decider = {