Unbreaking the build, adding missing file to checkin, I apologize for the inconvenience

This commit is contained in:
Viktor Klang 2011-07-14 11:26:38 +02:00
parent 749b3dac20
commit e9f498a1df

View file

@ -140,7 +140,7 @@ class CallingThreadDispatcher(val warnings: Boolean = true) extends MessageDispa
private[akka] override def dispatch(handle: MessageInvocation) { private[akka] override def dispatch(handle: MessageInvocation) {
val mbox = getMailbox(handle.receiver) val mbox = getMailbox(handle.receiver)
val queue = mbox.queue val queue = mbox.queue
val execute = mbox.suspended.ifElseYield { val execute = mbox.suspended.fold {
queue.push(handle) queue.push(handle)
if (warnings && handle.channel.isInstanceOf[Promise[_]]) { if (warnings && handle.channel.isInstanceOf[Promise[_]]) {
EventHandler.warning(this, "suspended, creating Future could deadlock; target: %s" format handle.receiver) EventHandler.warning(this, "suspended, creating Future could deadlock; target: %s" format handle.receiver)
@ -177,7 +177,7 @@ class CallingThreadDispatcher(val warnings: Boolean = true) extends MessageDispa
assert(queue.isActive) assert(queue.isActive)
mbox.lock.lock mbox.lock.lock
val recurse = try { val recurse = try {
val handle = mbox.suspended.ifElseYield[MessageInvocation] { val handle = mbox.suspended.fold[MessageInvocation] {
queue.leave queue.leave
null null
} { } {