Fix for removing a document with new attached file: ConvertsRelation was not removed...

[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 060f84db6674dd26c99064d109984fc5114dbee2..debc3f65f035398ea672c1a0cf1ec15dbf12b946 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
@@ -168,9 +168,28 @@ public abstract class Entity extends Any {
                        }
                }
                if (res != null) {
+                       if (LOG.isDebugEnabled()) {
+                               LOG.debug("Contains: "
+                                               + this.getAllRelations().contains(res));
+                               LOG.debug("Nb relations of this before: "
+                                               + this.getAllRelations().size());
+                       }
+                       res.owner = null;
                        this.getAllRelations().remove(res);
+                       if (LOG.isDebugEnabled()) {
+                               LOG.debug("Nb relations of this after: "
+                                               + this.getAllRelations().size());
+                       }
                        if (res.isBidirectional()) {
+                               if (LOG.isDebugEnabled()) {
+                                       LOG.debug("Nb relations of reverse before: "
+                                                       + ((Entity)res.getTo()).getAllRelations().size());
+                               }
                                ((Entity)res.getTo()).getAllRelations().remove(res.getReverse());
+                               if (LOG.isDebugEnabled()) {
+                                       LOG.debug("Nb relations of reverse after: "
+                                                       + ((Entity)res.getTo()).getAllRelations().size());
+                               }
                        }
                }
                return res;