spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-07 15:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from cbeams/SPR-8954

Browse Source 
Check original beanClass in #isFactoryBean calls
This commit is contained in:
jhoeller
2012-02-08 02:58:19 -08:00
parent 4f4a2e7fc7 f3f73f0e32
commit 5b18fc44ce
2 changed files with 100 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+4 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 the original author or authors.
* Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1328,8 +1328,9 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
* @param mbd the corresponding bean definition
*/
protected boolean isFactoryBean(String beanName, RootBeanDefinition mbd) {
Class<?> beanClass = predictBeanType(beanName, mbd, FactoryBean.class);
return (beanClass != null && FactoryBean.class.isAssignableFrom(beanClass));
Class<?> predictedType = predictBeanType(beanName, mbd, FactoryBean.class);
return (predictedType != null && FactoryBean.class.isAssignableFrom(predictedType)) ||
(mbd.hasBeanClass() && FactoryBean.class.isAssignableFrom(mbd.getBeanClass()));
}
/**