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

Merge branch 'async-system-messages' of github.com:jboner/akka into async-system-messages

Browse source
This commit is contained in:
Viktor Klang 2011-09-23 09:58:51 +02:00
commit f30bc274d3
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
View file

@ -390,7 +390,12 @@ abstract class ActorModelSpec extends JUnitSuite {
(1 to num) foreach { _ ⇒
newTestActor ! cachedMessage
}
assertCountDown(cachedMessage.latch, Testing.testTime(10000), "Should process " + num + " countdowns")
try {
assertCountDown(cachedMessage.latch, Testing.testTime(10000), "Should process " + num + " countdowns")
} catch {
case e ⇒
EventHandler.error(null, cachedMessage.latch.getCount())
}
}
for (run ← 1 to 3) {
flood(10000)

2
akka-actor/src/main/scala/akka/actor/ActorCell.scala
View file

@ -255,9 +255,9 @@ private[akka] class ActorCell(
receiveTimeout = None
cancelReceiveTimeout
Actor.registry.unregister(self)
dispatcher.detach(this)
isTerminated = true
terminated = isTerminated
dispatcher.detach(this)
try {
val a = actor.get
if (Actor.debugLifecycle) EventHandler.debug(a, "stopping")