Fixed removing of a document from scenario. Deleted related documents and their relat...

[tools/siman.git] / Workspace / Siman-Common / src / org / splat / dal / bo / kernel / Entity.java

diff --git a/Workspace/Siman-Common/src/org/splat/dal/bo/kernel/Entity.java b/Workspace/Siman-Common/src/org/splat/dal/bo/kernel/Entity.java
index bb8f0d490aa404f411fe80570f3323fb49996034..060f84db6674dd26c99064d109984fc5114dbee2 100644 (file)
--- a/Workspace/Siman-Common/src/org/splat/dal/bo/kernel/Entity.java
+++ b/Workspace/Siman-Common/src/org/splat/dal/bo/kernel/Entity.java
@@ -167,9 +167,11 @@ public abstract class Entity extends Any {
                                break;
                        }
                }
-               this.getAllRelations().remove(res);
-               if (res.isBidirectional()) {
-                       ((Entity)res.getTo()).getAllRelations().remove(res.getReverse());
+               if (res != null) {
+                       this.getAllRelations().remove(res);
+                       if (res.isBidirectional()) {
+                               ((Entity)res.getTo()).getAllRelations().remove(res.getReverse());
+                       }
                }
                return res;
        }