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

detect Lifecycle-implementing FactoryBeans as well (SPR-6545)

This commit is contained in:
Juergen Hoeller 2009-12-13 14:08:08 +00:00
parent 5f9b444319
commit a0c4d2c13c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.springframework.context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
View File

@ -217,13 +217,15 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
}
private Map<String, Lifecycle> getLifecycleBeans() {
String[] beanNames = this.beanFactory.getBeanNamesForType(Lifecycle.class, false, false);
Map<String, Lifecycle> beans = new LinkedHashMap<String, Lifecycle>();
for (String beanName : beanNames) {
if (this.beanFactory.containsSingleton(beanName) ||
SmartLifecycle.class.isAssignableFrom(this.beanFactory.getType(beanName))) {
Object bean = this.beanFactory.getBean(beanName);
if (!this.equals(bean)) {
Map<String, SmartLifecycle> smartLifecycles =
this.beanFactory.getBeansOfType(SmartLifecycle.class, false, true);
beans.putAll(smartLifecycles);
String[] singletonNames = this.beanFactory.getSingletonNames();
for (String beanName : singletonNames) {
if (!beans.containsKey(beanName)) {
Object bean = this.beanFactory.getSingleton(beanName);
if (bean instanceof Lifecycle && !this.equals(bean)) {
beans.put(beanName, (Lifecycle) bean);
}
}