ticket 972

This commit is contained in:
Peter Veentjer 2011-07-15 08:12:15 +03:00
parent 0e933d2442
commit f93624e7e0
50 changed files with 269 additions and 140 deletions

View file

@ -160,8 +160,6 @@ class Dispatcher(
private[akka] def reRegisterForExecution(mbox: MessageQueue with ExecutableMailbox): Unit =
registerForExecution(mbox)
private[akka] def doneProcessingMailbox(mbox: MessageQueue with ExecutableMailbox): Unit = ()
protected override def cleanUpMailboxFor(actorRef: ActorRef) {
val m = getMailbox(actorRef)
if (!m.isEmpty) {
@ -195,19 +193,10 @@ trait ExecutableMailbox extends Runnable { self: MessageQueue ⇒
def dispatcher: Dispatcher
final def run = {
try {
processMailbox()
} catch {
case ie: InterruptedException
}
finally {
dispatcherLock.unlock()
}
try { processMailbox()} finally {dispatcherLock.unlock()}
if (!self.isEmpty)
dispatcher.reRegisterForExecution(this)
dispatcher.doneProcessingMailbox(this)
}
/**