debugging DatabaseCache

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 3cfc3b4..691e799 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -525,7 +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);
-        
+        System.out.println("containskey: "+cache.containsKey((String)theResultHash.get(thePKeyName)));
         returnEntity = (Entity)cache.get((String)theResultHash.get(thePKeyName));
       }
       else {

diff --git a/source/mir/storage/DatabaseCache.java b/source/mir/storage/DatabaseCache.java
index 88b3182..bb25498 100755 (executable)
--- a/source/mir/storage/DatabaseCache.java
+++ b/source/mir/storage/DatabaseCache.java
@@ -54,7 +54,7 @@ public class DatabaseCache {
   public Object get(String key){
     System.out.println(_cache.size() +" "+ _counter);
     for(int i = 0; i<_cache.size(); i++){
-      if( ((Entry)_cache.get(i)).getKey(key).equals(key) )
+      if( _cache.get(i) != null && ((Entry)_cache.get(i)).getKey(key).equals(key) )
         System.out.println("test2: "+((Entry)_cache.get(i)).getKey(key));
         return ((Entry)_cache.get(i)).getValue();
     }