Skip to content

Commit 3c238d9

Browse files
committed
Use try-resource and reverse to do/while
1 parent 5786610 commit 3c238d9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -485,19 +485,19 @@ public IRubyObject execute(final ThreadContext context, final IRubyObject sql) {
485485
int updateCount = statement.getUpdateCount();
486486
IRubyObject result = null;
487487

488-
while (hasResultSet || updateCount != -1) {
488+
do {
489489
// Query has results to process (insert/update/delete) we move on to next
490490
if (hasResultSet) {
491-
ResultSet resultSet = statement.getResultSet();
492491
// For SELECT queries, return propr Result object
493-
result = mapQueryResult(context, connection, resultSet);
494-
resultSet.close();
492+
try (ResultSet rs = statement.getResultSet()) {
493+
result = mapQueryResult(context, connection, rs);
494+
}
495495
}
496496

497497
// Check to see if there is another result set
498498
hasResultSet = statement.getMoreResults();
499499
updateCount = statement.getUpdateCount();
500-
}
500+
} while (hasResultSet || updateCount != -1);
501501

502502
return result == null ?
503503
newEmptyResult(context) :

0 commit comments

Comments
 (0)