diff options
Diffstat (limited to 'src/actors/scala/actors/Actor.scala')
| -rw-r--r-- | src/actors/scala/actors/Actor.scala | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala index 98f5d2287f..059ab3abf7 100644 --- a/src/actors/scala/actors/Actor.scala +++ b/src/actors/scala/actors/Actor.scala @@ -589,18 +589,21 @@ trait Actor extends AbstractActor with ReplyReactor with ActorCanReply with Inpu done = true receiveTimeout } else { - waitingFor = f - received = None - isSuspended = true - val thisActor = this - onTimeout = Some(new TimerTask { - def run() { thisActor.send(TIMEOUT, thisActor) } - }) - Actor.timer.schedule(onTimeout.get, msec) - scheduler.managedBlock(blocker) - drainSendBuffer(mailbox) - // keep going - () => {} + if (onTimeout.isEmpty) { + waitingFor = f + received = None + isSuspended = true + val thisActor = this + onTimeout = Some(new TimerTask { + def run() { thisActor.send(TIMEOUT, thisActor) } + }) + Actor.timer.schedule(onTimeout.get, msec) + scheduler.managedBlock(blocker) + drainSendBuffer(mailbox) + // keep going + () => {} + } else + sys.error("unhandled timeout") } } todo() |