Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-13523 Remove an additional field from JdbcCoordinatorImpl

This commit is contained in:
Sanne Grinovero 2019-07-30 11:26:41 +01:00
parent c0c6e10272
commit 904ed10eaf
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
View File

@ -69,7 +69,6 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator {
private final HashMap<Statement,Set<ResultSet>> xref = new HashMap<>(); private final HashMap<Statement,Set<ResultSet>> xref = new HashMap<>();
private final Set<ResultSet> unassociatedResultSets = new HashSet<>(); private final Set<ResultSet> unassociatedResultSets = new HashSet<>();
private transient SqlExceptionHelper exceptionHelper;
private Statement lastQuery; private Statement lastQuery;
private final boolean isUserSuppliedConnection; private final boolean isUserSuppliedConnection;
@ -107,8 +106,6 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator {
this.jdbcServices = owner.getJdbcSessionContext() this.jdbcServices = owner.getJdbcSessionContext()
.getServiceRegistry() .getServiceRegistry()
.getService( JdbcServices.class ); .getService( JdbcServices.class );
this.exceptionHelper = jdbcServices
.getSqlExceptionHelper();
} }
private JdbcCoordinatorImpl( private JdbcCoordinatorImpl(
@ -121,8 +118,6 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator {
this.jdbcServices = owner.getJdbcSessionContext() this.jdbcServices = owner.getJdbcSessionContext()
.getServiceRegistry() .getServiceRegistry()
.getService( JdbcServices.class ); .getService( JdbcServices.class );
this.exceptionHelper = jdbcServices
.getSqlExceptionHelper();
} }
@Override @Override
@ -144,7 +139,7 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator {
* @return The SqlExceptionHelper * @return The SqlExceptionHelper
*/ */
public SqlExceptionHelper sqlExceptionHelper() { public SqlExceptionHelper sqlExceptionHelper() {
return exceptionHelper; return jdbcServices.getSqlExceptionHelper();
} }
private int flushDepth; private int flushDepth;
@ -349,7 +344,12 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator {
} }
} }
catch (SQLException sqle) { catch (SQLException sqle) {
throw exceptionHelper.convert( sqle, "Cannot cancel query" ); SqlExceptionHelper sqlExceptionHelper = jdbcServices.getSqlExceptionHelper();
//Should always be non-null, but to make sure as the implementation is lazy:
if ( sqlExceptionHelper != null ) {
sqlExceptionHelper = new SqlExceptionHelper( false );
}
throw sqlExceptionHelper.convert( sqle, "Cannot cancel query" );
} }
finally { finally {
lastQuery = null; lastQuery = null;