debugging DatabaseCache

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 26e35c2..3cfc3b4 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -525,6 +525,7 @@ public class Database implements StorageObject {
       if (cache != null && theResultHash.containsKey(thePKeyName) &&
             (cache.containsKey((String)theResultHash.get(thePKeyName)) > -1)) {
         //theLog.printDebugInfo("CACHE: (out) "+ theResultHash.get(thePKeyName)+ " :"+theTable);
+        
         returnEntity = (Entity)cache.get((String)theResultHash.get(thePKeyName));
       }
       else {

diff --git a/source/mir/storage/DatabaseCache.java b/source/mir/storage/DatabaseCache.java
index 1c38842..88b3182 100755 (executable)
--- a/source/mir/storage/DatabaseCache.java
+++ b/source/mir/storage/DatabaseCache.java
@@ -45,7 +45,7 @@ public class DatabaseCache {
   
   public int containsValue(Object o){
     for(int i = 0; i<_cache.size(); i++){
-      if(((Entry)_cache.get(i)).getValue().equals(o) )
+      if( _cache.get(i)!=null && ((Entry)_cache.get(i)).getValue().equals(o) )
         return i;
     }
     return -1;