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 
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 4a339f835a
15 changed files with 311 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
View file

@ -157,7 +157,7 @@ class ExecutorBasedEventDrivenDispatcher(
log.debug("Shutting down %s", toString)
executor.shutdownNow
active = false
references.clear
uuids.clear
}
def ensureNotActive(): Unit = if (active) throw new IllegalActorStateException(