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

Merge with Peter's work (i.e. merging master into tame-globals)

Browse source
This commit is contained in:
Roland 2011-10-13 14:17:07 +02:00
commit 44b94643e5
60 changed files with 2078 additions and 1700 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-http/src/main/scala/akka/http/Mist.scala
View file

@ -127,7 +127,7 @@ trait RootEndpointLocator {
def configureRoot(address: String) {
def findRoot(address: String): ActorRef =
app.registry.actorFor(address).getOrElse(
app.provider.actorFor(address).getOrElse(
throw new ConfigurationException("akka.http.root-actor-id configuration option does not have a valid actor address [" + address + "]"))
root = if ((address eq null) || address == "") findRoot(app.MistSettings.RootActorID) else findRoot(address)