SpringBeanContainer exposes bean instance returned from initializeBean

jhoeller · jhoeller · commit d9e72535328f · 2018-10-09T23:13:58.000+02:00
Issue: SPR-17332
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
@@ -170,7 +170,7 @@ private SpringContainedBean<?> createBean(
 			if (lifecycleOptions.useJpaCompliantCreation()) {
 				Object bean = this.beanFactory.autowire(beanType, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false);
 				this.beanFactory.applyBeanPropertyValues(bean, name);
-				this.beanFactory.initializeBean(bean, name);
+				bean = this.beanFactory.initializeBean(bean, name);
 				return new SpringContainedBean<>(bean, beanInstance -> this.beanFactory.destroyBean(name, beanInstance));
 			}
 			else {

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private SpringContainedBean<?> createBean(`
`170`	`170`	`if (lifecycleOptions.useJpaCompliantCreation()) {`
`171`	`171`	`Object bean = this.beanFactory.autowire(beanType, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false);`
`172`	`172`	`this.beanFactory.applyBeanPropertyValues(bean, name);`
`173`		`- this.beanFactory.initializeBean(bean, name);`
	`173`	`+ bean = this.beanFactory.initializeBean(bean, name);`
`174`	`174`	`return new SpringContainedBean<>(bean, beanInstance -> this.beanFactory.destroyBean(name, beanInstance));`
`175`	`175`	`}`
`176`	`176`	`else {`