From bb7c497bddf7231133b1f4ef9876ab87b77ee98a Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Sun, 29 Jun 2025 16:33:01 +0200 Subject: [PATCH] Remove obsolete code from internal HibernateTransactionObject See gh-35111 --- .../hibernate/HibernateTransactionManager.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/HibernateTransactionManager.java index dfed6cb504..8ad680da3e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/HibernateTransactionManager.java @@ -720,10 +720,6 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana // Else, we need to rely on the connection pool to perform proper cleanup. try { Connection con = session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection(); - Integer previousHoldability = txObject.getPreviousHoldability(); - if (previousHoldability != null) { - con.setHoldability(previousHoldability); - } DataSourceUtils.resetConnectionAfterTransaction( con, txObject.getPreviousIsolationLevel(), txObject.isReadOnly()); } @@ -771,7 +767,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana /** * Hibernate transaction object, representing a SessionHolder. - * Used as transaction object by HibernateTransactionManager. + *

Used as transaction object by HibernateTransactionManager. */ private class HibernateTransactionObject extends JdbcTransactionObjectSupport { @@ -783,8 +779,6 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana private boolean needsConnectionReset; - private @Nullable Integer previousHoldability; - public void setSession(Session session) { this.sessionHolder = new SessionHolder(session); this.newSessionHolder = true; @@ -828,14 +822,6 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana return this.needsConnectionReset; } - public void setPreviousHoldability(@Nullable Integer previousHoldability) { - this.previousHoldability = previousHoldability; - } - - public @Nullable Integer getPreviousHoldability() { - return this.previousHoldability; - } - public boolean hasSpringManagedTransaction() { return (this.sessionHolder != null && this.sessionHolder.getTransaction() != null); }