diff options
author | Caspar De Groot | 2010-01-18 10:09:01 +0000 |
---|---|---|
committer | Caspar De Groot | 2010-01-18 10:09:01 +0000 |
commit | da6dfefe10ed83dc74009c7424832d4d6f91cb7b (patch) | |
tree | 6b4cf922c59718e68e33e8273eec78b7b1f72ab0 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf | |
parent | 0f2b4f6f447342287deaf0ef68d6b25bfbefcca9 (diff) | |
download | cdo-da6dfefe10ed83dc74009c7424832d4d6f91cb7b.tar.gz cdo-da6dfefe10ed83dc74009c7424832d4d6f91cb7b.tar.xz cdo-da6dfefe10ed83dc74009c7424832d4d6f91cb7b.zip |
[298561] Uncommitted dangling references not removed on passiveUpdate/refresh
https://bugs.eclipse.org/bugs/show_bug.cgi?id=298561
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf')
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java index 7e889328d9..8cc3e29f1b 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java @@ -77,7 +77,14 @@ import org.eclipse.net4j.util.options.OptionsEvent; import org.eclipse.net4j.util.transaction.TransactionException; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.EStructuralFeature.Setting; +import org.eclipse.emf.ecore.util.EContentsEList; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.util.EContentsEList.FeatureIterator; import org.eclipse.emf.spi.cdo.CDOTransactionStrategy; import org.eclipse.emf.spi.cdo.InternalCDOObject; import org.eclipse.emf.spi.cdo.InternalCDOSavepoint; @@ -1581,6 +1588,41 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa } /** + * @since 3.0 + */ + @Override + public Set<CDOObject> handleInvalidationWithoutNotification(Set<CDOIDAndVersion> dirtyOIDs, + Collection<CDOID> detachedOIDs, Set<InternalCDOObject> dirtyObjects, Set<InternalCDOObject> detachedObjects) + { + // Bugzilla 298561: This override removes references to remotely + // detached objects that are present in any DIRTY or NEW objects + + removeCrossReferences(getDirtyObjects().values(), detachedOIDs); + removeCrossReferences(getNewObjects().values(), detachedOIDs); + + return super.handleInvalidationWithoutNotification(dirtyOIDs, detachedOIDs, dirtyObjects, detachedObjects); + } + + private void removeCrossReferences(Collection<CDOObject> objects, Collection<CDOID> referencedOIDs) + { + for (CDOObject object : objects) + { + for (EContentsEList.FeatureIterator<EObject> it = (FeatureIterator<EObject>)object.eCrossReferences().iterator(); it + .hasNext();) + { + EObject crossReferencedObject = it.next(); + if (crossReferencedObject instanceof CDOObject + && referencedOIDs.contains(((CDOObject)crossReferencedObject).cdoID())) + { + EReference eReference = (EReference)it.feature(); + Setting setting = ((InternalEObject)object).eSetting(eReference); + EcoreUtil.remove(setting, crossReferencedObject); + } + } + } + } + + /** * @author Simon McDuff */ private final class CDOCommitContextImpl implements InternalCDOCommitContext |