raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Reinstating the magic number 2 into the stack-hack by Roland

Browse source
This commit is contained in:
Viktor Klang 2012-03-01 16:59:33 +01:00
parent 8b02a20d75
commit 2c6d4ec960
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actor-migration/src/main/scala/akka/actor/GlobalActorSystem.scala
View file

@ -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

8
akka-actor/src/main/scala/akka/actor/ActorSystem.scala
View file

@ -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") ||