Fixed NPE when restarting Scheduler.

1 files changed, 4 insertions, 4 deletions

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
   }