ResultSe not closed in QueryRunner.insertBatch(Connection, String,

ResultSetHandler, Object[][]).
apache · Jul 31, 2023 · d563207 · d563207
1 parent 2b43139
commit d563207
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -75,6 +75,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" due-to="Gary Gregory" type="fix">
         ResultSet not closed in QueryRunner.insert(Connection, String, ResultSetHandler, Object...).
       </action>
+      <action dev="ggregory" due-to="Gary Gregory" type="fix">
+        ResultSet not closed in QueryRunner.insertBatch(Connection, String, ResultSetHandler, Object[][]).
+      </action>
       <!-- ADD -->
       <action dev="thecarlhall" type="add" issue="PR/9" due-to="rewerma">
         Add @Column annotation to hint the field name instead of dissecting the get method name.

diff --git a/src/main/java/org/apache/commons/dbutils/QueryRunner.java b/src/main/java/org/apache/commons/dbutils/QueryRunner.java
@@ -490,9 +490,9 @@ public <T> T insertBatch(final Connection conn, final String sql, final ResultSe
                 stmt.addBatch();
             }
             stmt.executeBatch();
-            final ResultSet rs = stmt.getGeneratedKeys();
-            generatedKeys = rsh.handle(rs);
-
+            try (ResultSet rs = stmt.getGeneratedKeys()) {
+                generatedKeys = rsh.handle(rs);
+            }
         } catch (final SQLException e) {
             this.rethrow(e, sql, (Object[])params);
         } finally {