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

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2022-03-25 18:08:55 +01:00
parent 42a61b966b cb36ca31f6
commit 12d8010395
4 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java vendored
View File

@@ -79,7 +79,7 @@ import org.springframework.transaction.support.ResourceTransactionDefinition;
* @author Costin Leau
* @since 2.0
* @see HibernateJpaVendorAdapter
* @see org.hibernate.Session#setFlushMode
* @see org.hibernate.Session#setHibernateFlushMode
* @see org.hibernate.Transaction#setTimeout
*/
@SuppressWarnings("serial")
@@ -349,10 +349,9 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
this.readOnly = readOnly;
}
@SuppressWarnings("deprecation")
public void resetSessionState() {
if (this.previousFlushMode != null) {
this.session.setFlushMode(this.previousFlushMode);
this.session.setHibernateFlushMode(this.previousFlushMode);
}
if (this.needsConnectionReset &&
this.session.getJdbcCoordinator().getLogicalConnection().isPhysicallyConnected()) {