spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-24 15:49:26 +00:00
Code Issues Projects Releases Wiki Activity

Polishing

Browse Source 
(cherry picked from commit dc36bb34c7)
This commit is contained in:
Juergen Hoeller
2018-08-02 15:12:54 +02:00
parent 7da02fb7e3
commit 13637ec3b5
5 changed files with 90 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+8 -7
View File
@@ -126,7 +126,7 @@ public abstract class SharedEntityManagerCreator {
/**
* Create a transactional EntityManager proxy for the given EntityManagerFactory.
* @param emf EntityManagerFactory to obtain EntityManagers from as needed
* @param emf the EntityManagerFactory to obtain EntityManagers from as needed
* @param properties the properties to be passed into the
* {@code createEntityManager} call (may be {@code null})
* @param entityManagerInterfaces the interfaces to be implemented by the
@@ -141,7 +141,7 @@ public abstract class SharedEntityManagerCreator {
/**
* Create a transactional EntityManager proxy for the given EntityManagerFactory.
* @param emf EntityManagerFactory to obtain EntityManagers from as needed
* @param emf the EntityManagerFactory to obtain EntityManagers from as needed
* @param properties the properties to be passed into the
* {@code createEntityManager} call (may be {@code null})
* @param synchronizedWithTransaction whether to automatically join ongoing
@@ -187,6 +187,7 @@ public abstract class SharedEntityManagerCreator {
public SharedEntityManagerInvocationHandler(
EntityManagerFactory target, Map<?, ?> properties, boolean synchronizedWithTransaction) {
this.targetFactory = target;
this.properties = properties;
this.synchronizedWithTransaction = synchronizedWithTransaction;
@@ -339,11 +340,11 @@ public abstract class SharedEntityManagerCreator {
private final Query target;
private EntityManager em;
private EntityManager entityManager;
public DeferredQueryInvocationHandler(Query target, EntityManager em) {
public DeferredQueryInvocationHandler(Query target, EntityManager entityManager) {
this.target = target;
this.em = em;
this.entityManager = entityManager;
}
@Override
@@ -381,8 +382,8 @@ public abstract class SharedEntityManagerCreator {
if (queryTerminatingMethods.contains(method.getName())) {
// Actual execution of the query: close the EntityManager right
// afterwards, since that was the only reason we kept it open.
EntityManagerFactoryUtils.closeEntityManager(this.em);
this.em = null;
EntityManagerFactoryUtils.closeEntityManager(this.entityManager);
this.entityManager = null;
}
}
}