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

Merge branch 'master' of git@github.com:jboner/akka

Browse source
This commit is contained in:
Jonas Bonér 2010-05-28 10:58:51 +02:00
commit fe6fb1e7e8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-core/src/main/scala/config/Config.scala
View file

@ -43,7 +43,7 @@ object Config extends Logging {
"\n\tdue to: " + e.toString)
}
Configgy.config
} else if (getClass.getClassLoader.getResource("akka.conf") != null) {
} else if (getClass.getClassLoader.getResource("/akka.conf") != null) {
try {
Configgy.configureFromResource("akka.conf", getClass.getClassLoader)
log.info("Config loaded from the application classpath.")
@ -74,7 +74,7 @@ object Config extends Logging {
"\n\t3. Define 'AKKA_HOME' environment variable pointing to the root of the Akka distribution." +
"\nI have no way of finding the 'akka.conf' configuration file." +
"\nUsing default values everywhere.")
CConfig.fromString("<akka></akka>")
CConfig.fromString("<akka></akka>") // default empty config
}
}