Skip to content

connection: fix statement leak from commiting transactions #300

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

Open
Adam- wants to merge 1 commit into
base: master
Choose a base branch
from
Open

connection: fix statement leak from commiting transactions #300

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
29 changes: 19 additions & 10 deletions core/src/main/java/org/sql2o/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ public Connection rollback(boolean closeConnection){
logger.warn("Could not roll back transaction. message: {}", e);
}
finally {
if(closeConnection) this.closeJdbcConnection();
if(closeConnection) {
this.closeAndClearStatements();
this.closeJdbcConnection();
}
}
return this;
}
Expand All @@ -152,8 +155,10 @@ public Connection commit(boolean closeConnection){
throw new Sql2oException(e);
}
finally {
if(closeConnection)
if(closeConnection) {
this.closeAndClearStatements();
this.closeJdbcConnection();
}
}
return this;
}
Expand Down Expand Up @@ -263,6 +268,17 @@ void removeStatement(Statement statement){
statements.remove(statement);
}

private void closeAndClearStatements() {
for (Statement statement : statements) {
try {
getSql2o().getQuirks().closeStatement(statement);
} catch (Throwable e) {
logger.warn("Could not close statement.", e);
}
}
statements.clear();
}

public void close() {
boolean connectionIsClosed;
try {
Expand All @@ -273,14 +289,7 @@ public void close() {

if (!connectionIsClosed) {

for (Statement statement : statements) {
try {
getSql2o().getQuirks().closeStatement(statement);
} catch (Throwable e) {
logger.warn("Could not close statement.", e);
}
}
statements.clear();
closeAndClearStatements();

boolean rollback = rollbackOnClose;
if (rollback) {
Expand Down