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 falls back to "taskScheduler" bean by name 

Issue: SPR-13236
This commit is contained in:
Juergen Hoeller 2015-07-17 16:29:48 +02:00
parent 0cce41eb94
commit 66d8c2819f
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,14 @@ public class ScheduledAnnotationBeanPostProcessor implements BeanPostProcessor,
EmbeddedValueResolverAware, BeanFactoryAware, ApplicationContextAware, EmbeddedValueResolverAware, BeanFactoryAware, ApplicationContextAware,
SmartInitializingSingleton, ApplicationListener<ContextRefreshedEvent>, DisposableBean { SmartInitializingSingleton, ApplicationListener<ContextRefreshedEvent>, DisposableBean {
/**
* The default name of the TaskScheduler bean to pick up: "taskScheduler".
* <p>Note that the initial lookup happens by type; this is just the fallback
* in case of multiple scheduler beans found in the context.
*/
public static final String DEFAULT_TASK_SCHEDULER_BEAN_NAME = "taskScheduler";
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());
private Object scheduler; private Object scheduler;
@ -181,12 +189,19 @@ public class ScheduledAnnotationBeanPostProcessor implements BeanPostProcessor,
Assert.state(this.beanFactory != null, "BeanFactory must be set to find scheduler by type"); Assert.state(this.beanFactory != null, "BeanFactory must be set to find scheduler by type");
try { try {
// Search for TaskScheduler bean... // Search for TaskScheduler bean...
this.registrar.setScheduler(this.beanFactory.getBean(TaskScheduler.class)); this.registrar.setTaskScheduler(this.beanFactory.getBean(TaskScheduler.class));
} }
catch (NoUniqueBeanDefinitionException ex) { catch (NoUniqueBeanDefinitionException ex) {
throw new IllegalStateException("More than one TaskScheduler exists within the context. " + try {
"Remove all but one of the beans; or implement the SchedulingConfigurer interface and call " + this.registrar.setTaskScheduler(
"ScheduledTaskRegistrar#setScheduler explicitly within the configureTasks() callback.", ex); this.beanFactory.getBean(DEFAULT_TASK_SCHEDULER_BEAN_NAME, TaskScheduler.class));
}
catch (NoSuchBeanDefinitionException ex2) {
throw new IllegalStateException("More than one TaskScheduler bean exists within the context, and " +
"none is named 'taskScheduler'. Mark one of them as primary or name it 'taskScheduler' "+
"(possibly as an alias); or implement the SchedulingConfigurer interface and call " +
"ScheduledTaskRegistrar#setScheduler explicitly within the configureTasks() callback.", ex);
}
} }
catch (NoSuchBeanDefinitionException ex) { catch (NoSuchBeanDefinitionException ex) {
logger.debug("Could not find default TaskScheduler bean", ex); logger.debug("Could not find default TaskScheduler bean", ex);
@ -195,9 +210,10 @@ public class ScheduledAnnotationBeanPostProcessor implements BeanPostProcessor,
this.registrar.setScheduler(this.beanFactory.getBean(ScheduledExecutorService.class)); this.registrar.setScheduler(this.beanFactory.getBean(ScheduledExecutorService.class));
} }
catch (NoUniqueBeanDefinitionException ex2) { catch (NoUniqueBeanDefinitionException ex2) {
throw new IllegalStateException("More than one ScheduledExecutorService exists within the context. " + throw new IllegalStateException("More than one ScheduledExecutorService bean exists within " +
"Remove all but one of the beans; or implement the SchedulingConfigurer interface and call " + "the context. Mark one of them as primary; or implement the SchedulingConfigurer " +
"ScheduledTaskRegistrar#setScheduler explicitly within the configureTasks() callback.", ex); "interface and call ScheduledTaskRegistrar#setScheduler explicitly within the " +
"configureTasks() callback.", ex);
} }
catch (NoSuchBeanDefinitionException ex2) { catch (NoSuchBeanDefinitionException ex2) {
logger.debug("Could not find default ScheduledExecutorService bean", ex); logger.debug("Could not find default ScheduledExecutorService bean", ex);