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

Clear out interrupted flag before we recurse. See #2454

Browse source
This commit is contained in:
Björn Antonsson 2012-08-30 15:21:51 +02:00
parent 8de174723b
commit 70ec85b084
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
View file

@ -237,11 +237,15 @@ class CallingThreadDispatcher(
try {
if (Mailbox.debug) println(mbox.actor.self + " processing message " + handle)
mbox.actor.invoke(handle)
if (Thread.interrupted()) { // clear interrupted flag before we continue
intex = new InterruptedException("Interrupted during message processing")
log.error(intex, "Interrupted during message processing")
}
true
} catch {
case ie: InterruptedException ⇒
log.error(ie, "Interrupted during message processing")
Thread.currentThread().interrupt()
Thread.interrupted() // clear interrupted flag before continuing
intex = ie
true
case NonFatal(e) ⇒
@ -262,7 +266,7 @@ class CallingThreadDispatcher(
runQueue(mbox, queue, intex)
} else {
if (intex ne null) {
Thread.interrupted // clear interrupted flag before throwing according to java convention
Thread.interrupted() // clear interrupted flag before throwing according to java convention
throw intex
}
}