Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistently accept "taskExecutor" bean of type Executor (as stated in @EnableAsync's javadoc)

Browse Source 
Issue: SPR-15566
(cherry picked from commit 3cc94ae)
This commit is contained in:
Juergen Hoeller
2017-05-25 23:37:02 +02:00
parent ac25db6d2b
commit 9cb9884533
3 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,6 +221,7 @@ public class ScheduledAnnotationBeanPostProcessor
this.registrar.setTaskScheduler(resolveSchedulerBean(TaskScheduler.class, false));
}
catch (NoUniqueBeanDefinitionException ex) {
logger.debug("Could not find unique TaskScheduler bean", ex);
try {
this.registrar.setTaskScheduler(resolveSchedulerBean(TaskScheduler.class, true));
}
@@ -241,6 +242,7 @@ public class ScheduledAnnotationBeanPostProcessor
this.registrar.setScheduler(resolveSchedulerBean(ScheduledExecutorService.class, false));
}
catch (NoUniqueBeanDefinitionException ex2) {
logger.debug("Could not find unique ScheduledExecutorService bean", ex2);
try {
this.registrar.setScheduler(resolveSchedulerBean(ScheduledExecutorService.class, true));
}