fix #53 by adding sanity check on eObject(Id)

atlanmod · Jan 16, 2017 · c1638b7 · c1638b7
1 parent 2e42c4e
commit c1638b7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/.../hbase/src/main/java/fr/inria/atlanmod/neoemf/data/hbase/store/DirectWriteHBaseStore.java b/.../hbase/src/main/java/fr/inria/atlanmod/neoemf/data/hbase/store/DirectWriteHBaseStore.java
@@ -262,10 +262,13 @@ public EStructuralFeature getContainingFeature(InternalEObject internalObject) {
 
     @Override
     public EObject eObject(Id id) {
-        EClass eClass = resolveInstanceOf(id);
-        PersistentEObject object = persistentObjectsCache.get(id, new PersistentEObjectCacheLoader(eClass));
-        if (object.resource() != resource()) {
-            object.resource(resource());
+        PersistentEObject object = null;
+        if(id != null) {
+            EClass eClass = resolveInstanceOf(id);
+            object = persistentObjectsCache.get(id, new PersistentEObjectCacheLoader(eClass));
+            if (object.resource() != resource()) {
+                object.resource(resource());
+            }
         }
         return object;
     }

diff --git a/.../main/java/fr/inria/atlanmod/neoemf/data/berkeleydb/store/DirectWriteBerkeleyDbStore.java b/.../main/java/fr/inria/atlanmod/neoemf/data/berkeleydb/store/DirectWriteBerkeleyDbStore.java
@@ -298,10 +298,13 @@ public EStructuralFeature getContainingFeature(InternalEObject internalObject) {
 
     @Override
     public EObject eObject(Id id) {
-        EClass eClass = resolveInstanceOf(id);
-        PersistentEObject object = persistentObjectsCache.get(id, new PersistentEObjectCacheLoader(eClass));
-        if (object.resource() != resource()) {
-            object.resource(resource());
+        PersistentEObject object = null;
+        if(id != null) {
+            EClass eClass = resolveInstanceOf(id);
+            object = persistentObjectsCache.get(id, new PersistentEObjectCacheLoader(eClass));
+            if (object.resource() != resource()) {
+                object.resource(resource());
+            }
         }
         return object;
     }

diff --git a/.../mapdb/src/main/java/fr/inria/atlanmod/neoemf/data/mapdb/store/DirectWriteMapDbStore.java b/.../mapdb/src/main/java/fr/inria/atlanmod/neoemf/data/mapdb/store/DirectWriteMapDbStore.java
@@ -311,10 +311,13 @@ public EStructuralFeature getContainingFeature(InternalEObject internalObject) {
 
     @Override
     public EObject eObject(Id id) {
-        EClass eClass = resolveInstanceOf(id);
-        PersistentEObject object = persistentObjectsCache.get(id, new PersistentEObjectCacheLoader(eClass));
-        if (object.resource() != resource()) {
-            object.resource(resource());
+        PersistentEObject object = null;
+        if(id != null) {
+            EClass eClass = resolveInstanceOf(id);
+            object = persistentObjectsCache.get(id, new PersistentEObjectCacheLoader(eClass));
+            if (object.resource() != resource()) {
+                object.resource(resource());
+            }
         }
         return object;
     }