[empire-db] branch master updated: EMPIREDB-282 small fixes for unusual cases

[doebele]

This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new 97d1394  EMPIREDB-282 small fixes for unusual cases
97d1394 is described below

commit 97d1394b798b9680c04e7ef104c9373d6e7a19a8
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Fri Apr 24 09:43:41 2020 +0200

    EMPIREDB-282
    small fixes for unusual cases
---
 empire-db/src/main/java/org/apache/empire/db/DBReader.java             | 3 +++
 .../src/main/java/org/apache/empire/db/validation/DBModelChecker.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 @@ public class DBReader extends DBRecordData
         this.db = db;
         this.colList = colList;
         this.rset = rset;
+        // clear fieldIndexMap         
+        if (fieldIndexMap!=null)
+            fieldIndexMap.clear();
         // add to tracking list (if enabled)
         trackThisResultSet();
     }
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 @@ public class DBModelChecker
 
         if (remoteView == null)
         {
-            handler.itemNotFound(remoteView);
+            handler.itemNotFound(view);
             return;
         }