summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2011-07-04 05:16:09 (EDT)
committerCaspar De Groot2011-07-04 05:16:09 (EDT)
commit57aa94e151446b9ff681e21ef292d7889f9c7a8c (patch)
tree7c54786717fcf8910847b257beeafeea07c415e8
parent6bb19ac6980303638f24702e5c7f440483094906 (diff)
downloadcdo-57aa94e151446b9ff681e21ef292d7889f9c7a8c.zip
cdo-57aa94e151446b9ff681e21ef292d7889f9c7a8c.tar.gz
cdo-57aa94e151446b9ff681e21ef292d7889f9c7a8c.tar.bz2
[Bug 350420] CommitIntegrityCheck should check old set target only if it's containtment or has eOpp
https://bugs.eclipse.org/bugs/show_bug.cgi?id=350420
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
index 296a402..a971760 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
@@ -249,8 +249,11 @@ public class CommitIntegrityCheck
CDOID oldID = (CDOID)transaction.convertObjectToID(oldIDOrObject);
if (oldIDOrObject != null)
{
- // Old child must be included
- checkIncluded(oldID, "removed/former child/refTarget of", dirtyObject);
+ // Old child must be included if it's the container or has an eOpposite
+ if (containmentOrWithOpposite)
+ {
+ checkIncluded(oldID, "removed/former child/refTarget of", dirtyObject);
+ }
}
if (newIDOrObject != null)