[#7097] Avoid consuming result sets that aren't being closed or scrol…

…lable
jOOQ · Jan 25, 2018 · 8f96a58 · 8f96a58
1 parent c8812d0
commit 8f96a58
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsContext.java
@@ -51,6 +51,7 @@
 final class DefaultDiagnosticsContext implements DiagnosticsContext {
 
     ResultSet          resultSet;
+    boolean            resultSetClosing;
     int                resultSetFetchedColumns;
     int                resultSetActualColumns;
     int                resultSetFetchedRows;
@@ -90,12 +91,15 @@ public final int resultSetActualRows() {
             return -1;
 
         try {
-            while (resultSet.next())
-                resultSetActualRows++;
+            if (resultSetClosing || resultSet.getType() != ResultSet.TYPE_FORWARD_ONLY) {
+                while (resultSet.next())
+                    resultSetActualRows++;
 
-            resultSet.absolute(resultSetFetchedRows);
+                resultSet.absolute(resultSetFetchedRows);
+            }
         }
         catch (SQLException ignore) {}
+
         return resultSetActualRows;
     }
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/DiagnosticsResultSet.java b/jOOQ/src/main/java/org/jooq/impl/DiagnosticsResultSet.java
@@ -745,6 +745,7 @@ public final void close() throws SQLException {
                 super.absolute(current = rows);
 
             DefaultDiagnosticsContext ctx = ctx();
+            ctx.resultSetClosing = true;
 
             if (super.next())
                 connection.listeners.tooManyRowsFetched(ctx);