Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

397769 - TimerScheduler does not relinquish cancelled tasks.

Browse Source 
Now the scheduler submits itself as a task that runs every second to purge the task queue.
This commit is contained in:
Simone Bordet 2013-01-24 16:06:20 +01:00
parent 6980a8d9d2
commit 29d2854027
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jetty-util/src/main/java/org/eclipse/jetty/util/thread/TimerScheduler.java
View File

@ -27,7 +27,7 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
public class TimerScheduler extends AbstractLifeCycle implements Scheduler
public class TimerScheduler extends AbstractLifeCycle implements Scheduler, Runnable
{
private static final Logger LOG = Log.getLogger(TimerScheduler.class);
@ -49,14 +49,15 @@ public class TimerScheduler extends AbstractLifeCycle implements Scheduler
public TimerScheduler(String name, boolean daemon)
{
_name=name;
_daemon=daemon;
_name = name;
_daemon = daemon;
}
@Override
protected void doStart() throws Exception
{
_timer=_name==null?new Timer():new Timer(_name,_daemon);
_timer = _name == null ? new Timer() : new Timer(_name, _daemon);
run();
super.doStart();
}
@ -65,18 +66,29 @@ public class TimerScheduler extends AbstractLifeCycle implements Scheduler
{
_timer.cancel();
super.doStop();
_timer=null;
_timer = null;
}
@Override
public Task schedule(final Runnable task, final long delay, final TimeUnit units)
{
Timer timer=_timer;
if (timer==null)
throw new RejectedExecutionException("STOPPED: "+this);
SimpleTask t = new SimpleTask(task);
timer.schedule(t,units.toMillis(delay));
return t;
Timer timer = _timer;
if (timer == null)
throw new RejectedExecutionException("STOPPED: " + this);
SimpleTask t = new SimpleTask(task);
timer.schedule(t, units.toMillis(delay));
return t;
}
@Override
public void run()
{
Timer timer = _timer;
if (timer != null)
{
timer.purge();
schedule(this, 1, TimeUnit.SECONDS);
}
}
private static class SimpleTask extends TimerTask implements Task
@ -85,7 +97,7 @@ public class TimerScheduler extends AbstractLifeCycle implements Scheduler
private SimpleTask(Runnable runnable)
{
_task=runnable;
_task = runnable;
}
@Override
@ -97,7 +109,7 @@ public class TimerScheduler extends AbstractLifeCycle implements Scheduler
}
catch (Throwable x)
{
LOG.debug("Exception while executing task "+_task,x);
LOG.debug("Exception while executing task " + _task, x);
}
}