From 51615fcd586f9752b92a3bbce27b4ed563f5738a Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Tue, 20 Jan 2009 11:34:16 +0000 Subject: Fixed #1652. --- src/actors/scala/actors/Actor.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/actors') diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala index e0442aa586..dc9b8110bc 100644 --- a/src/actors/scala/actors/Actor.scala +++ b/src/actors/scala/actors/Actor.scala @@ -549,8 +549,13 @@ trait Actor extends AbstractActor { onTimeout = Some(new TimerTask { def run() { thisActor.send(TIMEOUT, thisActor) } }) - Actor.timer.schedule(onTimeout.get, msec) - + try { + Actor.timer.schedule(onTimeout.get, msec) + } catch { + case ise: IllegalStateException => + Actor.timer = new Timer + Actor.timer.schedule(onTimeout.get, msec) + } continuation = f isDetached = true } -- cgit v1.2.3