X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fentity%2Fadapter%2FEntityAdapter.java;h=74a481e91b973cc4d8053e0e9c78570401183af2;hb=3389d56d4d82089033fd83f9c8758126ffd7da44;hp=3a0b76aba7a34002bb5ffcd20f1ada4fec97c418;hpb=f9a7655d20e23418320dd552f257893f25268d16;p=mir.git

diff --git a/source/mir/entity/adapter/EntityAdapter.java b/source/mir/entity/adapter/EntityAdapter.java
index 3a0b76ab..74a481e9 100755
--- a/source/mir/entity/adapter/EntityAdapter.java
+++ b/source/mir/entity/adapter/EntityAdapter.java
@@ -15,11 +15,16 @@ public class EntityAdapter implements Map {
   }
 
   public boolean containsKey(Object aKey) {
-    if (aKey instanceof String)
-      return      entity.hasValueForField((String) aKey)
-              || definition.hasCalculatedField((String) aKey);
-    else
-      return false;
+    try {
+      if (aKey instanceof String)
+        return      entity.hasValueForField((String) aKey)
+                || definition.hasCalculatedField((String) aKey)
+                || entity.getFields().contains(aKey);
+    }
+    catch (Throwable t) {
+    }
+
+    return false;
   }
 
   public boolean equals(Object anObject) {