Skip to content

Return connection to pool when commit fails. (#125) #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zantvoort merged 1 commit into from
May 13, 2026
Merged

Return connection to pool when commit fails. (#125) #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions storm-kotlin/src/main/kotlin/st/orm/template/impl/JdbcTransactionContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,18 @@ internal class JdbcTransactionContext : TransactionContext {
}
state.ownsConnection -> {
logger.debug("Committing transaction on {} ({}).", connection, state.transactionId)
if (!connection.autoCommit) connection.commit()
close(connection, state)
try {
if (!connection.autoCommit) connection.commit()
} finally {
// Always return the connection to the pool — even if commit() threw — so the pool
// does not retain a connection with autoCommit=false (which would fail the auto-commit
// precondition on the next openNewTransaction()).
try {
close(connection, state)
} catch (closeException: SQLException) {
logger.warn("Failed to close connection after commit ({}).", state.transactionId, closeException)
}
}
}
else -> {
// joined REQUIRED: nothing to do yet.
Expand Down Expand Up @@ -473,8 +483,18 @@ internal class JdbcTransactionContext : TransactionContext {
}
state.ownsConnection && connection != null -> {
logger.debug("Rolling back transaction on {} ({}).", connection, state.transactionId)
if (!connection.autoCommit) connection.rollback()
close(connection, state)
try {
if (!connection.autoCommit) connection.rollback()
} finally {
// Always return the connection to the pool — even if rollback() threw — so the pool
// does not retain a connection with autoCommit=false (which would fail the auto-commit
// precondition on the next openNewTransaction()).
try {
close(connection, state)
} catch (closeException: SQLException) {
logger.warn("Failed to close connection after rollback ({}).", state.transactionId, closeException)
}
}
}
else -> {
// Joined REQUIRED or non-transactional scope (no connection):
Expand Down
Loading