github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#4011] Loader does not call release() when acquiring connections to commit transactions

Browse Source
This commit is contained in:
lukaseder 2015-01-29 15:37:12 +01:00
parent 1fff3741bd
commit de3c2e71a2
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
View File

@ -49,6 +49,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
@ -547,7 +548,7 @@ class LoaderImpl<R extends TableRecord<R>> implements
if (commit == COMMIT_AFTER) {
if ((processed % batchAfter == 0) && ((processed / batchAfter) % commitAfter == 0)) {
configuration.connectionProvider().acquire().commit();
commit();
}
}
}
@ -592,17 +593,17 @@ class LoaderImpl<R extends TableRecord<R>> implements
if (commit == COMMIT_ALL) {
if (!errors.isEmpty()) {
stored = 0;
configuration.connectionProvider().acquire().rollback();
rollback();
}
else {
configuration.connectionProvider().acquire().commit();
commit();
}
}
// Commit remaining elements in COMMIT_AFTER mode
else if (commit == COMMIT_AFTER) {
if ((processed % batchAfter != 0) || ((processed / batchAfter) % commitAfter != 0)) {
configuration.connectionProvider().acquire().commit();
commit();
}
}
}
@ -611,6 +612,28 @@ class LoaderImpl<R extends TableRecord<R>> implements
}
}
private void commit() throws SQLException {
Connection connection = configuration.connectionProvider().acquire();
try {
connection.commit();
}
finally {
configuration.connectionProvider().release(connection);
}
}
private void rollback() throws SQLException {
Connection connection = configuration.connectionProvider().acquire();
try {
connection.rollback();
}
finally {
configuration.connectionProvider().release(connection);
}
}
/**
* Type-safety...
*/