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

HHH-15082 Abort JDBC batches on runtime exceptions as well as SQLException

This commit is contained in:
Yoann Rodière 2022-02-17 14:49:55 +01:00 committed by Sanne Grinovero
parent 73e9859fea
commit ec6cd5d0cc
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java
View File

@ -82,6 +82,10 @@ public class BatchingBatch extends AbstractBatchImpl {
LOG.debug( "SQLException escaped proxy", e );
throw sqlExceptionHelper().convert( e, "could not perform addBatch", currentStatementSql );
}
catch (RuntimeException e) {
abortBatch();
throw e;
}
statementPosition++;
if ( statementPosition >= getKey().getBatchedStatementCount() ) {
batchPosition++;

2
hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java
View File

@ -45,7 +45,7 @@ public class NonBatchingBatch extends AbstractBatchImpl {
abortBatch();
throw sqlExceptionHelper().convert( e, "could not execute non-batched batch statement", statementSQL );
}
catch (JDBCException e) {
catch (RuntimeException e) {
abortBatch();
throw e;
}

8
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -3357,7 +3357,7 @@ public abstract class AbstractEntityPersister
);
}
}
catch (SQLException | JDBCException e) {
catch (SQLException | RuntimeException e) {
if ( useBatch ) {
session.getJdbcCoordinator().abortBatch();
}
@ -3558,7 +3558,7 @@ public abstract class AbstractEntityPersister
}
}
catch (SQLException e) {
catch (SQLException | RuntimeException e) {
if ( useBatch ) {
session.getJdbcCoordinator().abortBatch();
}
@ -3684,11 +3684,11 @@ public abstract class AbstractEntityPersister
}
}
catch (SQLException sqle) {
catch (SQLException | RuntimeException e) {
if ( useBatch ) {
session.getJdbcCoordinator().abortBatch();
}
throw sqle;
throw e;
}
finally {
if ( !useBatch ) {