From 072804e13332bbf9e4d315e961e9929c83882fba Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sun, 18 Mar 2012 13:02:13 +0000
Subject: [PATCH] Release 2.1.0 - Fixed Oracle regression

---
 .../main/java/org/jooq/impl/AbstractResultQuery.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
index 2f88c6274c..4e0e633df9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
@@ -178,8 +178,11 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
             // Fetch several result sets
             else {
                 results = new ArrayList<Result<Record>>();
+                boolean anyResults = false;
 
                 while (ctx.resultSet() != null) {
+                    anyResults = true;
+
                     FieldProvider fields = new MetaDataFieldProvider(ctx, ctx.resultSet().getMetaData());
                     Cursor<Record> c = new CursorImpl<Record>(ctx, listener, fields, true);
                     results.add(c.fetch());
@@ -192,7 +195,12 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
                     }
                 }
 
-                ctx.statement().getMoreResults(Statement.CLOSE_ALL_RESULTS);
+                // Call this only when there was at least one ResultSet.
+                // Otherwise, this call is not supported by ojdbc...
+                if (anyResults) {
+                    ctx.statement().getMoreResults(Statement.CLOSE_ALL_RESULTS);
+                }
+
                 ctx.statement().close();
             }
         }