From 9325f2a582ccfba041edfd0fb2c45e42c8ab30a3 Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Wed, 20 May 2009 09:42:11 +0000 Subject: Fixed NPE when restarting Scheduler. --- src/actors/scala/actors/Scheduler.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/actors') diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala index 3a6a205a34..c4ebe85861 100644 --- a/src/actors/scala/actors/Scheduler.scala +++ b/src/actors/scala/actors/Scheduler.scala @@ -60,10 +60,10 @@ object Scheduler extends IScheduler { s.start() s } - //Actor.timer = new java.util.Timer - while (!tasks.isEmpty()) { - sched.execute(tasks.take().asInstanceOf[FJTask]) - } + if (tasks != null) + while (!tasks.isEmpty()) { + sched.execute(tasks.take().asInstanceOf[FJTask]) + } tasks = null } -- cgit v1.2.3