root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

ScheduledTaskRegistrar (as used for @Scheduled processing) properly shuts down its default executor (SPR-6901) 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3366 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2010-05-25 14:22:49 +00:00
parent 22ab9d6ce8
commit 4aec5dd5ae
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -42,6 +42,8 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
private TaskScheduler taskScheduler; private TaskScheduler taskScheduler;
private ScheduledExecutorService localExecutor;
private Map<Runnable, Trigger> triggerTasks; private Map<Runnable, Trigger> triggerTasks;
private Map<Runnable, String> cronTasks; private Map<Runnable, String> cronTasks;
@ -53,11 +55,19 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
private final Set<ScheduledFuture> scheduledFutures = new LinkedHashSet<ScheduledFuture>(); private final Set<ScheduledFuture> scheduledFutures = new LinkedHashSet<ScheduledFuture>();
/**
* Set the TaskScheduler to register scheduled tasks with.
*/
public void setTaskScheduler(TaskScheduler taskScheduler) { public void setTaskScheduler(TaskScheduler taskScheduler) {
Assert.notNull(taskScheduler, "TaskScheduler must not be null"); Assert.notNull(taskScheduler, "TaskScheduler must not be null");
this.taskScheduler = taskScheduler; this.taskScheduler = taskScheduler;
} }
/**
* Set the {@link org.springframework.scheduling.TaskScheduler} to register scheduled
* tasks with, or a {@link java.util.concurrent.ScheduledExecutorService} to be
* wrapped as a TaskScheduler.
*/
public void setScheduler(Object scheduler) { public void setScheduler(Object scheduler) {
Assert.notNull(scheduler, "Scheduler object must not be null"); Assert.notNull(scheduler, "Scheduler object must not be null");
if (scheduler instanceof TaskScheduler) { if (scheduler instanceof TaskScheduler) {
@ -71,18 +81,34 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
} }
} }
/**
* Specify triggered tasks as a Map of Runnables (the tasks) and Trigger objects
* (typically custom implementations of the {@link Trigger} interface).
*/
public void setTriggerTasks(Map<Runnable, Trigger> triggerTasks) { public void setTriggerTasks(Map<Runnable, Trigger> triggerTasks) {
this.triggerTasks = triggerTasks; this.triggerTasks = triggerTasks;
} }
/**
* Specify triggered tasks as a Map of Runnables (the tasks) and cron expressions.
* @see CronTrigger
*/
public void setCronTasks(Map<Runnable, String> cronTasks) { public void setCronTasks(Map<Runnable, String> cronTasks) {
this.cronTasks = cronTasks; this.cronTasks = cronTasks;
} }
/**
* Specify triggered tasks as a Map of Runnables (the tasks) and fixed-rate values.
* @see TaskScheduler#scheduleAtFixedRate(Runnable, long)
*/
public void setFixedRateTasks(Map<Runnable, Long> fixedRateTasks) { public void setFixedRateTasks(Map<Runnable, Long> fixedRateTasks) {
this.fixedRateTasks = fixedRateTasks; this.fixedRateTasks = fixedRateTasks;
} }
/**
* Specify triggered tasks as a Map of Runnables (the tasks) and fixed-delay values.
* @see TaskScheduler#scheduleWithFixedDelay(Runnable, long)
*/
public void setFixedDelayTasks(Map<Runnable, Long> fixedDelayTasks) { public void setFixedDelayTasks(Map<Runnable, Long> fixedDelayTasks) {
this.fixedDelayTasks = fixedDelayTasks; this.fixedDelayTasks = fixedDelayTasks;
} }
@ -90,7 +116,8 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
public void afterPropertiesSet() { public void afterPropertiesSet() {
if (this.taskScheduler == null) { if (this.taskScheduler == null) {
this.taskScheduler = new ConcurrentTaskScheduler(Executors.newSingleThreadScheduledExecutor()); this.localExecutor = Executors.newSingleThreadScheduledExecutor();
this.taskScheduler = new ConcurrentTaskScheduler(this.localExecutor);
} }
if (this.triggerTasks != null) { if (this.triggerTasks != null) {
for (Map.Entry<Runnable, Trigger> entry : this.triggerTasks.entrySet()) { for (Map.Entry<Runnable, Trigger> entry : this.triggerTasks.entrySet()) {
@ -98,7 +125,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
} }
} }
if (this.cronTasks != null) { if (this.cronTasks != null) {
for (Map.Entry<Runnable, String> entry : cronTasks.entrySet()) { for (Map.Entry<Runnable, String> entry : this.cronTasks.entrySet()) {
this.scheduledFutures.add(this.taskScheduler.schedule(entry.getKey(), new CronTrigger(entry.getValue()))); this.scheduledFutures.add(this.taskScheduler.schedule(entry.getKey(), new CronTrigger(entry.getValue())));
} }
} }
@ -119,6 +146,9 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
for (ScheduledFuture future : this.scheduledFutures) { for (ScheduledFuture future : this.scheduledFutures) {
future.cancel(true); future.cancel(true);
} }
if (this.localExecutor != null) {
this.localExecutor.shutdownNow();
}
} }
} }