Timer.java (TaskQueue.isStopped): Remove method.
* java/util/Timer.java (TaskQueue.isStopped): Remove method. (Scheduler.run): Try to re-schedule task and ignore exception if queue has been stopped. From-SVN: r47093
This commit is contained in:
parent
81bbae61ce
commit
74808218ae
2 changed files with 16 additions and 11 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2001-11-16 Mark Wielaard <mark@klomp.org>
|
||||||
|
|
||||||
|
* java/util/Timer.java (TaskQueue.isStopped): Remove method.
|
||||||
|
(Scheduler.run): Try to re-schedule task and ignore exception if
|
||||||
|
queue has been stopped.
|
||||||
|
|
||||||
2001-11-15 Tom Tromey <tromey@redhat.com>
|
2001-11-15 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
* verify.cc (type::compatible): Use _Jv_IsAssignableFrom.
|
* verify.cc (type::compatible): Use _Jv_IsAssignableFrom.
|
||||||
|
|
|
@ -285,14 +285,6 @@ public class Timer
|
||||||
this.notify();
|
this.notify();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method returns <code>true</code> if the queue has been
|
|
||||||
* stopped.
|
|
||||||
*/
|
|
||||||
public synchronized boolean isStopped ()
|
|
||||||
{
|
|
||||||
return this.heap == null;
|
|
||||||
}
|
|
||||||
} // TaskQueue
|
} // TaskQueue
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -346,8 +338,7 @@ public class Timer
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calculate next time and possibly re-enqueue.
|
// Calculate next time and possibly re-enqueue.
|
||||||
// Don't bother re-scheduling if the queue has been stopped.
|
if (task.scheduled >= 0)
|
||||||
if (! queue.isStopped () && task.scheduled >= 0)
|
|
||||||
{
|
{
|
||||||
if (task.fixed)
|
if (task.fixed)
|
||||||
{
|
{
|
||||||
|
@ -357,8 +348,16 @@ public class Timer
|
||||||
{
|
{
|
||||||
task.scheduled = task.period + System.currentTimeMillis();
|
task.scheduled = task.period + System.currentTimeMillis();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
queue.enqueue(task);
|
queue.enqueue(task);
|
||||||
}
|
}
|
||||||
|
catch (IllegalStateException ise)
|
||||||
|
{
|
||||||
|
// Ignore. Apparently the Timer queue has been stopped.
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} // Scheduler
|
} // Scheduler
|
||||||
|
|
Loading…
Add table
Reference in a new issue