From 2c6d4ec960a41d095dfd4699dad090de947e608e Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Thu, 1 Mar 2012 16:59:33 +0100 Subject: [PATCH] Reinstating the magic number 2 into the stack-hack by Roland --- .../src/main/scala/akka/actor/GlobalActorSystem.scala | 2 +- akka-actor/src/main/scala/akka/actor/ActorSystem.scala | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-actor-migration/src/main/scala/akka/actor/GlobalActorSystem.scala b/akka-actor-migration/src/main/scala/akka/actor/GlobalActorSystem.scala index 0eae8797d8..93787d43a6 100644 --- a/akka-actor-migration/src/main/scala/akka/actor/GlobalActorSystem.scala +++ b/akka-actor-migration/src/main/scala/akka/actor/GlobalActorSystem.scala @@ -26,7 +26,7 @@ object GlobalActorSystem extends ActorSystemImpl("GlobalSystem", OldConfiguratio */ @deprecated("use default config location or write your own configuration loader", "2.0") object OldConfigurationLoader { - val oldClassLoader: ClassLoader = ActorSystem.findClassLoader(1) + val oldClassLoader: ClassLoader = ActorSystem.findClassLoader() val defaultConfig: Config = { val cfg = fromProperties orElse fromClasspath orElse fromHome getOrElse emptyConfig diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index 557a62133c..c8ac8dbb7c 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -50,10 +50,10 @@ object ActorSystem { */ def apply(): ActorSystem = apply("default") def apply(name: String): ActorSystem = { - val classLoader = findClassLoader(1) + val classLoader = findClassLoader() apply(name, ConfigFactory.load(classLoader), classLoader) } - def apply(name: String, config: Config): ActorSystem = apply(name, config, findClassLoader(1)) + def apply(name: String, config: Config): ActorSystem = apply(name, config, findClassLoader()) def apply(name: String, config: Config, classLoader: ClassLoader): ActorSystem = new ActorSystemImpl(name, config, classLoader).start() class Settings(classLoader: ClassLoader, cfg: Config, final val name: String) { @@ -105,9 +105,9 @@ object ActorSystem { /** * INTERNAL */ - private[akka] def findClassLoader(depth: Int): ClassLoader = { + private[akka] def findClassLoader(): ClassLoader = { def findCaller(get: Int ⇒ Class[_]): ClassLoader = - Iterator.from(depth).map(get) dropWhile { c ⇒ + Iterator.from(2 /*is the magic number, promise*/ ).map(get) dropWhile { c ⇒ c != null && (c.getName.startsWith("akka.actor.ActorSystem") || c.getName.startsWith("scala.Option") ||