spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-20 12:19:16 +00:00
Code Issues Projects Releases Wiki Activity

PersistenceAnnotationBeanPostProcessor defensively handles BeanDefinition access for extended EntityManagers

Browse Source 
Issue: SPR-8834
(cherry picked from commit 592e344)
This commit is contained in:
Juergen Hoeller
2014-08-22 23:47:26 +02:00
parent e89f18bf6d
commit 388561df61
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 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.
@@ -691,8 +691,8 @@ public class PersistenceAnnotationBeanPostProcessor
// Inject a container-managed extended EntityManager.
em = ExtendedEntityManagerCreator.createContainerManagedEntityManager(emf, this.properties);
}
if (em instanceof EntityManagerProxy &&
beanFactory != null && !beanFactory.isPrototype(requestingBeanName)) {
if (em instanceof EntityManagerProxy && beanFactory != null &&
beanFactory.containsBean(requestingBeanName) && !beanFactory.isPrototype(requestingBeanName)) {
extendedEntityManagersToClose.put(target, ((EntityManagerProxy) em).getTargetEntityManager());
}
return em;