diff --git a/teaql-provider-jdbc/src/main/java/io/teaql/provider/jdbc/JdbcSqlExecutor.java b/teaql-provider-jdbc/src/main/java/io/teaql/provider/jdbc/JdbcSqlExecutor.java index c433a51e..4c2503f6 100644 --- a/teaql-provider-jdbc/src/main/java/io/teaql/provider/jdbc/JdbcSqlExecutor.java +++ b/teaql-provider-jdbc/src/main/java/io/teaql/provider/jdbc/JdbcSqlExecutor.java @@ -386,18 +386,22 @@ public class JdbcSqlExecutor implements SqlExecutionAdapter { return; } try (Connection connection = openConnection()) { - boolean autoCommit = connection.getAutoCommit(); connection.setAutoCommit(false); transactionConnection.set(connection); try { action.run(); connection.commit(); - } catch (RuntimeException | Error failure) { - connection.rollback(); + } catch (SQLException | RuntimeException | Error failure) { + // A failed COMMIT is still an uncommitted transaction. Roll it + // back before restoring auto-commit (which can itself commit). + try { connection.rollback(); } + catch (SQLException rollbackFailure) { failure.addSuppressed(rollbackFailure); } throw failure; } finally { transactionConnection.remove(); - connection.setAutoCommit(autoCommit); + // The connection is operation-owned and is closed immediately. + // Do not restore auto-commit: JDBC defines that transition as + // COMMIT, including after a failed rollback. } } catch (SQLException e) { throw new RuntimeException("JDBC transaction failed", e);