diff options
author | Philipp Haller <hallerp@gmail.com> | 2009-05-20 09:42:11 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2009-05-20 09:42:11 +0000 |
commit | 9325f2a582ccfba041edfd0fb2c45e42c8ab30a3 (patch) | |
tree | fcb2768ee45e36ff0b6b0093f65bd9d37e43c933 /src | |
parent | 457f6dfc11a1ad205b75f5196c20ff31ff6386e3 (diff) | |
download | scala-9325f2a582ccfba041edfd0fb2c45e42c8ab30a3.tar.gz scala-9325f2a582ccfba041edfd0fb2c45e42c8ab30a3.tar.bz2 scala-9325f2a582ccfba041edfd0fb2c45e42c8ab30a3.zip |
Fixed NPE when restarting Scheduler.
Diffstat (limited to 'src')
-rw-r--r-- | src/actors/scala/actors/Scheduler.scala | 8 |
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 } |