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

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2026-07-31 16:28:17 +02:00
parent 7c2fdcc1fb f5564e7e31
commit 0376dd9a78
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
Vendored
+2 -3
View File
@@ -24,7 +24,6 @@ import java.util.concurrent.locks.ReentrantLock;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceException;
import org.eclipse.persistence.sessions.DatabaseLogin;
import org.eclipse.persistence.sessions.DatabaseSession;
import org.eclipse.persistence.sessions.UnitOfWork;
import org.jspecify.annotations.Nullable;
@@ -176,8 +175,8 @@ public class EclipseLinkJpaDialect extends DefaultJpaDialect {
public Connection getConnection() {
Connection con = this.connection;
if (con == null) {
DatabaseSession dbs = this.entityManager.unwrap(DatabaseSession.class);
if (dbs.isInTransaction()) {
UnitOfWork uow = this.entityManager.unwrap(UnitOfWork.class);
if (uow.getParent().isInTransaction()) {
// Existing Connection to be retrieved from this EntityManager.
con = this.entityManager.unwrap(Connection.class);
}