Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
#1183 - Switching order of HOME and MODE so that it's always system p…
…roperty first, then env variable
  • Loading branch information
viktorklang committed Sep 16, 2011
1 parent d36b169 commit 560c420
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions akka-actor/src/main/scala/akka/config/Config.scala
Expand Up @@ -32,7 +32,7 @@ object Config {
case value Some(value)
}

envHome orElse systemHome
systemHome orElse envHome
}

val config: Configuration = {
Expand All @@ -47,7 +47,7 @@ object Config {
case value Some(value)
}

(envConf orElse systemConf).map("akka." + _ + ".conf").getOrElse("akka.conf")
(systemConf orElse envConf).map("akka." + _ + ".conf").getOrElse("akka.conf")
}

val (newInstance, source) =
Expand Down

0 comments on commit 560c420

Please sign in to comment.