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

Avoid stack overflow in case of chained factory-bean references to FactoryBean class

Browse Source 
Issue: SPR-14551
(cherry picked from commit 8b5d355)
This commit is contained in:
Juergen Hoeller
2016-08-11 22:56:14 +02:00
parent 79a56967a1
commit e23ac031ff
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -325,8 +325,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
} }
@Override @Override
public Object resolveDependency(DependencyDescriptor descriptor, String beanName) throws BeansException { public Object resolveDependency(DependencyDescriptor descriptor, String requestingBeanName) throws BeansException {
return resolveDependency(descriptor, beanName, null, null); return resolveDependency(descriptor, requestingBeanName, null, null);
} }
@@ -802,10 +802,14 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
if (objectType.value != null) { if (objectType.value != null) {
return objectType.value; return objectType.value;
} }
else {
// No type found for shortcut FactoryBean instance:
// fall back to full creation of the FactoryBean instance.
return super.getTypeForFactoryBean(beanName, mbd);
}
} }
// No type found - fall back to full creation of the FactoryBean instance. return null;
return super.getTypeForFactoryBean(beanName, mbd);
} }
/** /**
@@ -824,7 +828,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
SmartInstantiationAwareBeanPostProcessor ibp = (SmartInstantiationAwareBeanPostProcessor) bp; SmartInstantiationAwareBeanPostProcessor ibp = (SmartInstantiationAwareBeanPostProcessor) bp;
exposedObject = ibp.getEarlyBeanReference(exposedObject, beanName); exposedObject = ibp.getEarlyBeanReference(exposedObject, beanName);
if (exposedObject == null) { if (exposedObject == null) {
return exposedObject; return null;
} }
} }
} }

4
spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ public abstract class AbstractEntityManagerFactoryIntegrationTests extends org.s
} }
static enum Provider { enum Provider {
ECLIPSELINK, HIBERNATE, OPENJPA ECLIPSELINK, HIBERNATE, OPENJPA
} }

6
spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager.xml
View File

@@ -30,4 +30,10 @@
</property> </property>
</bean> </bean>
<bean id="sessionFactory" factory-bean="entityManagerFactory" factory-method="getSessionFactory"/>
<bean id="hibernateStatistics" factory-bean="sessionFactory" factory-method="getStatistics"/>
<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
</beans> </beans>