fix: EXPOSED-373 Close ResultSet before closing Statement to suppress…

… Agroal leak warning (#2247) * fix: close ResultSet before closing Statement suppresses "JDBC resources leaked" warning with agroal * fix: close ResultSet before closing Statement address review comments
JetBrains · Sep 23, 2024 · 27baa04 · 27baa04
1 parent 420fe6f
commit 27baa04
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/AbstractQuery.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/AbstractQuery.kt
@@ -103,7 +103,9 @@ abstract class AbstractQuery<T : AbstractQuery<T>>(
             set(value) {
                 field = value
                 if (!field) {
-                    rs.statement?.close()
+                    val statement = rs.statement
+                    rs.close()
+                    statement?.close()
                     transaction.openResultSetsCount--
                 }
             }

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/ExplainQuery.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/ExplainQuery.kt
@@ -43,7 +43,9 @@ open class ExplainQuery(
             set(value) {
                 field = value
                 if (!field) {
-                    rs.statement?.close()
+                    val statement = rs.statement
+                    rs.close()
+                    statement?.close()
                     transaction.openResultSetsCount--
                 }
             }

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/InsertStatement.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/InsertStatement.kt
@@ -199,6 +199,7 @@ open class InsertStatement<Key : Any>(
         return inserted.apply {
             insertedCount = this
             resultedValues = processResults(rs, this)
+            rs?.close()
         }
     }
 

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/ReturningStatement.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/ReturningStatement.kt
@@ -45,7 +45,9 @@ open class ReturningStatement(
             set(value) {
                 field = value
                 if (!field) {
-                    rs.statement?.close()
+                    val statement = rs.statement
+                    rs.close()
+                    statement?.close()
                     transaction.openResultSetsCount--
                 }
             }