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

Conflicts:
	akka-actor/src/main/resources/logback.xml
	akka-actor/src/main/scala/dataflow/DataFlowVariable.scala
	akka-actor/src/test/scala/dataflow/DataFlowSpec.scala
	akka-remote/src/main/scala/remote/RemoteClient.scala
	akka-remote/src/test/resources/logback-test.xml
This commit is contained in:
Jonas Bonér 2010-08-29 17:33:29 +02:00
commit be32e80985
15 changed files with 311 additions and 237 deletions

View file

@ -411,6 +411,8 @@ class RemoteServerHandler(
} else future.getChannel.close
}
})
} else {
server.foreachListener(_ ! RemoteServerClientConnected(server))
}
}