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

2010-09-29 09:48:57 +02:00 · 2010-09-29 09:48:57 +02:00 · bd95d20edb
commit bd95d20edb
parent f22ce96b18 c8480412b7
29 changed files with 246 additions and 105 deletions
--- a/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
+++ b/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
@ -116,6 +116,10 @@ class ExecutorBasedEventDrivenDispatcher(
        val started = if (isDeadlineEnabled) System.currentTimeMillis else 0
        do {
          nextMessage.invoke
+
+          if (nextMessage.receiver.isBeingRestarted)
+            return !self.isEmpty
+
          if (throttle) { // Will be elided when false
            processedMessages += 1
            if ((processedMessages >= throughput) ||