commit 97d1394b798b9680c04e7ef104c9373d6e7a19a8
author Rainer Döbele <doebele@apache.org> Fri Apr 24 09:43:41 2020 +0200
committer Rainer Döbele <doebele@apache.org> Fri Apr 24 09:43:41 2020 +0200
tree fa013f68a21c9678995f95d237b6a0a6cab75e12
parent a71d6c0b35cfd66f2bd6d4f7d71405909aad4867

EMPIREDB-282
small fixes for unusual cases

empire-db/src/main/java/org/apache/empire/db/DBReader.java

diff --git a/empire-db/src/main/java/org/apache/empire/db/DBReader.java b/empire-db/src/main/java/org/apache/empire/db/DBReader.java
index cf3d939..e161aa2 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBReader.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBReader.java
@@ -834,6 +834,9 @@
         this.db = db;

         this.colList = colList;

         this.rset = rset;

+        // clear fieldIndexMap         

+        if (fieldIndexMap!=null)

+            fieldIndexMap.clear();

         // add to tracking list (if enabled)

         trackThisResultSet();

     }

empire-db/src/main/java/org/apache/empire/db/validation/DBModelChecker.java

diff --git a/empire-db/src/main/java/org/apache/empire/db/validation/DBModelChecker.java b/empire-db/src/main/java/org/apache/empire/db/validation/DBModelChecker.java
index 061bfbd..db36dec 100644
--- a/empire-db/src/main/java/org/apache/empire/db/validation/DBModelChecker.java
+++ b/empire-db/src/main/java/org/apache/empire/db/validation/DBModelChecker.java
@@ -364,7 +364,7 @@
 

         if (remoteView == null)

         {

-            handler.itemNotFound(remoteView);

+            handler.itemNotFound(view);

             return;

         }