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

HibernateJpaVendorAdapter and LocalSessionFactoryBuilder enforce Hibernate 5.2's connection handling mode DELAYED_ACQUISITION_AND_HOLD

Browse Source 
Issue: SPR-14393
This commit is contained in:
Juergen Hoeller
2016-06-24 12:37:31 +02:00
parent 5e08598a2a
commit 711eb99812
4 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
}
private boolean prepareConnection = (HibernateConnectionHandle.sessionConnectionMethod == null);
boolean prepareConnection = (HibernateConnectionHandle.sessionConnectionMethod == null);
/**
@@ -362,25 +362,15 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
}
if (this.preparedCon != null && this.session.isConnected()) {
Connection conToReset = HibernateConnectionHandle.doGetConnection(this.session);
if (!isEquivalentConnection(conToReset)) {
if (conToReset != this.preparedCon) {
LogFactory.getLog(HibernateJpaDialect.class).warn(
"JDBC Connection to reset not equivalent to originally prepared Connection - please " +
"JDBC Connection to reset not identical to originally prepared Connection - please " +
"make sure to use connection release mode ON_CLOSE (the default) and to run against " +
"Hibernate 4.2+ (or switch HibernateJpaDialect's prepareConnection flag to false");
}
DataSourceUtils.resetConnectionAfterTransaction(conToReset, this.previousIsolationLevel);
}
}
private boolean isEquivalentConnection(Connection con) {
try {
return (con.equals(this.preparedCon) ||
con.unwrap(Connection.class).equals(this.preparedCon.unwrap(Connection.class)));
}
catch (Throwable ex) {
return false;
}
}
}

26
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java vendored
View File

@@ -101,6 +101,27 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
}
/**
* Set whether to prepare the underlying JDBC Connection of a transactional
* Hibernate Session, that is, whether to apply a transaction-specific
* isolation level and/or the transaction's read-only flag to the underlying
* JDBC Connection.
* <p>See {@link HibernateJpaDialect#setPrepareConnection(boolean)} for details.
* This is just a convenience flag passed through to {@code HibernateJpaDialect}.
* <p>On Hibernate 5.2, this flag remains {@code true} by default like against
* previous Hibernate versions. The vendor adapter manually enforces Hibernate's
* new connection handling mode {@code DELAYED_ACQUISITION_AND_HOLD} in that case
* unless a user-specified connection handling mode property indicates otherwise;
* switch this flag to {@code false} to avoid that interference.
* @since 4.3.1
* @see #getJpaPropertyMap()
* @see HibernateJpaDialect#beginTransaction
*/
public void setPrepareConnection(boolean prepareConnection) {
this.jpaDialect.setPrepareConnection(prepareConnection);
}
@Override
public PersistenceProvider getPersistenceProvider() {
return this.persistenceProvider;
@@ -132,6 +153,11 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
jpaProperties.put(Environment.SHOW_SQL, "true");
}
if (this.jpaDialect.prepareConnection) {
// Hibernate 5.2: manually enforce connection release mode ON_CLOSE (the former default)
jpaProperties.put("hibernate.connection.handling_mode", "DELAYED_ACQUISITION_AND_HOLD");
}
return jpaProperties;
}