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

Close StoredProcedureQuery if it implements AutoCloseable.

Browse Source 
If the JPA provider's implementation of StoredProcedureQuery implements AutoCloseable, invoke the close method when completed.

Resolves #2915.
Original pull request: #2938
This commit is contained in:
Greg L. Turnquist
2023-05-04 16:13:45 -05:00
committed by Mark Paluch
parent 0f8279bbfa
commit 32c8951a93
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
View File

@@ -332,24 +332,36 @@ public abstract class JpaQueryExecution {
Assert.isInstanceOf(StoredProcedureJpaQuery.class, jpaQuery);
StoredProcedureJpaQuery storedProcedureJpaQuery = (StoredProcedureJpaQuery) jpaQuery;
StoredProcedureQuery storedProcedure = storedProcedureJpaQuery.createQuery(accessor);
boolean returnsResultSet = storedProcedure.execute();
try {
if (returnsResultSet) {
boolean returnsResultSet = storedProcedure.execute();
if (!SurroundingTransactionDetectorMethodInterceptor.INSTANCE.isSurroundingTransactionActive()) {
throw new InvalidDataAccessApiUsageException(NO_SURROUNDING_TRANSACTION);
if (returnsResultSet) {
if (!SurroundingTransactionDetectorMethodInterceptor.INSTANCE.isSurroundingTransactionActive()) {
throw new InvalidDataAccessApiUsageException(NO_SURROUNDING_TRANSACTION);
}
if (storedProcedureJpaQuery.getQueryMethod().isCollectionQuery()) {
return storedProcedure.getResultList();
} else {
return storedProcedure.getSingleResult();
}
}
if (storedProcedureJpaQuery.getQueryMethod().isCollectionQuery()) {
return storedProcedure.getResultList();
} else {
return storedProcedure.getSingleResult();
return storedProcedureJpaQuery.extractOutputValue(storedProcedure);
} finally {
if (storedProcedure instanceof AutoCloseable autoCloseable) {
try {
autoCloseable.close();
} catch (Exception ignored) {}
}
}
return storedProcedureJpaQuery.extractOutputValue(storedProcedure);
}
}