Use try-with-resources

apache · Jul 31, 2023 · 987860a · 987860a
1 parent 4a2eaf8
commit 987860a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/main/java/org/apache/commons/dbutils/QueryRunner.java b/src/main/java/org/apache/commons/dbutils/QueryRunner.java
@@ -271,15 +271,12 @@ private <T> List<T> execute(final Connection conn, final boolean closeConn, fina
             boolean moreResultSets = stmt.execute();
             // Handle multiple result sets by passing them through the handler
             // retaining the final result
-            ResultSet rs = null;
             while (moreResultSets) {
-                try {
-                    rs = this.wrap(stmt.getResultSet());
+                try (@SuppressWarnings("resource")
+                // assume the ResultSet wrapper properly closes
+                ResultSet rs = this.wrap(stmt.getResultSet())) {
                     results.add(rsh.handle(rs));
                     moreResultSets = stmt.getMoreResults();
-
-                } finally {
-                    close(rs);
                 }
             }
             this.retrieveOutParameters(stmt, params);