root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2019-08-01 22:42:33 +02:00
parent 765d43b34f
commit 7ac665b18e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
View File

@ -823,9 +823,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
* it will be fully created to check the type of its exposed object. * it will be fully created to check the type of its exposed object.
*/ */
@Override @Override
protected ResolvableType getTypeForFactoryBean(String beanName, protected ResolvableType getTypeForFactoryBean(String beanName, RootBeanDefinition mbd, boolean allowInit) {
RootBeanDefinition mbd, boolean allowInit) {
// Check if the bean definition itself has defined the type with an attribute // Check if the bean definition itself has defined the type with an attribute
ResolvableType result = getTypeForFactoryBeanFromAttributes(mbd); ResolvableType result = getTypeForFactoryBeanFromAttributes(mbd);
if (result != ResolvableType.NONE) { if (result != ResolvableType.NONE) {
@ -858,14 +856,14 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
// Try to obtain the FactoryBean's object type from its factory method // Try to obtain the FactoryBean's object type from its factory method
// declaration without instantiating the containing bean at all. // declaration without instantiating the containing bean at all.
BeanDefinition factoryBeanDefinition = getBeanDefinition(factoryBeanName); BeanDefinition factoryBeanDefinition = getBeanDefinition(factoryBeanName);
Class<?> factoryBeanClass = null; Class<?> factoryBeanClass;
if (factoryBeanDefinition instanceof AbstractBeanDefinition if (factoryBeanDefinition instanceof AbstractBeanDefinition &&
&& ((AbstractBeanDefinition) factoryBeanDefinition).hasBeanClass()) { ((AbstractBeanDefinition) factoryBeanDefinition).hasBeanClass()) {
factoryBeanClass = ((AbstractBeanDefinition) factoryBeanDefinition).getBeanClass(); factoryBeanClass = ((AbstractBeanDefinition) factoryBeanDefinition).getBeanClass();
} }
else { else {
RootBeanDefinition fbmbd = getMergedBeanDefinition(factoryBeanName, factoryBeanDefinition); RootBeanDefinition fbmbd = getMergedBeanDefinition(factoryBeanName, factoryBeanDefinition);
factoryBeanClass = determineTargetType(factoryBeanName, fbmbd, new Class<?>[] { Object.class }); factoryBeanClass = determineTargetType(factoryBeanName, fbmbd);
} }
if (factoryBeanClass != null) { if (factoryBeanClass != null) {
result = getTypeForFactoryBeanFromMethod(factoryBeanClass, factoryMethodName); result = getTypeForFactoryBeanFromMethod(factoryBeanClass, factoryMethodName);