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

ScheduledAnnotationBeanPostProcessor properly registers multiple tasks per bean 

Issue: SPR-14286
This commit is contained in:
Juergen Hoeller 2016-05-30 22:47:31 +02:00
parent 24f5f368b0
commit 3576ff051c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
View File

@ -302,8 +302,11 @@ public class ScheduledAnnotationBeanPostProcessor implements DestructionAwareBea
String errorMessage =
"Exactly one of the 'cron', 'fixedDelay(String)', or 'fixedRate(String)' attributes is required";
Set<ScheduledTask> tasks =
new LinkedHashSet<ScheduledTask>(4);
Set<ScheduledTask> tasks = this.scheduledTasks.get(bean);
if (tasks == null) {
tasks = new LinkedHashSet<ScheduledTask>(4);
this.scheduledTasks.put(bean, tasks);
}
// Determine initial delay
long initialDelay = scheduled.initialDelay();
@ -397,7 +400,6 @@ public class ScheduledAnnotationBeanPostProcessor implements DestructionAwareBea
// Check whether we had any attribute set
Assert.isTrue(processedSchedule, errorMessage);
this.scheduledTasks.put(bean, tasks);
}
catch (IllegalArgumentException ex) {
throw new IllegalStateException(