[CONJ-403] NPE when result-set close() after having thrown an exception

mariadb-corporation · Jan 3, 2017 · 628cd85 · 628cd85
1 parent 73657f8
commit 628cd85
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java b/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java
@@ -401,6 +401,7 @@ public boolean readNextValue(List<byte[][]> values) throws IOException, QueryExc
                 ErrorPacket errorPacket = new ErrorPacket(buffer, false);
                 lastReusableArray = null;
                 protocol = null;
+                isEof = true;
                 packetFetcher = null;
                 inputStream = null;
                 if (statement != null) {
@@ -446,6 +447,7 @@ public boolean readNextValue(List<byte[][]> values) throws IOException, QueryExc
             ErrorPacket errorPacket = new ErrorPacket(buffer);
             lastReusableArray = null;
             protocol = null;
+            isEof = true;
             packetFetcher = null;
             inputStream = null;
             if (statement != null) {
@@ -514,6 +516,7 @@ public void close() throws SQLException {
                 ExceptionMapper.throwException(queryException, null, this.statement);
             } finally {
                 protocol = null;
+                isEof = true;
                 packetFetcher = null;
                 inputStream = null;
                 lock.unlock();