[Bug 341875] Unsetting container ref not working correctly for NEW objects if resolveProxies=true

https://bugs.eclipse.org/bugs/show_bug.cgi?id=341875

1 files changed, 21 insertions, 26 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
index 663f35686e..3a6d975c36 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
@@ -195,13 +195,6 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
 
     EClass eClass = revision.getEClass();
 
-    CDOStore store = view.getStore();
-    InternalEObject eContainer = store.getContainer(this);
-    if (eContainer != null && eContainmentFeature().isResolveProxies())
-    {
-      adjustOppositeReference(this, eContainer, eContainmentFeature());
-    }
-
     // This loop adjusts the opposite wrapper objects to support dangling references. See Bugzilla_251263_Test
     for (EStructuralFeature feature : CDOModelUtil.getAllPersistentFeatures(eClass))
     {
@@ -959,25 +952,27 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
     return wrapperRegistry.get().containsKey(wrapper.cdoID());
   }
 
-  private void adjustOppositeReference(InternalCDOObject cdoObject, EObject oppositeObject, EReference oppositeReference)
-  {
-    if (oppositeObject != null)
-    {
-      InternalCDOObject oppositeCDOObject = (InternalCDOObject)CDOUtil.getCDOObject(oppositeObject);
-
-      if (!FSMUtil.isTransient(oppositeCDOObject) && !EMFUtil.isPersistent(oppositeReference))
-      {
-        adjustPersistentOppositeReference(cdoObject, oppositeObject, oppositeReference);
-      }
-      else
-      {
-        if (oppositeReference.isResolveProxies())
-        {
-          adjustTransientOppositeReference(instance, (InternalEObject)oppositeObject, oppositeReference);
-        }
-      }
-    }
-  }
+  // TODO: Remove this method if it is ensured that ist is not needed anymore
+  // private void adjustOppositeReference(InternalCDOObject cdoObject, EObject oppositeObject, EReference
+  // oppositeReference)
+  // {
+  // if (oppositeObject != null)
+  // {
+  // InternalCDOObject oppositeCDOObject = (InternalCDOObject)CDOUtil.getCDOObject(oppositeObject);
+  //
+  // if (!FSMUtil.isTransient(oppositeCDOObject) && !EMFUtil.isPersistent(oppositeReference))
+  // {
+  // adjustPersistentOppositeReference(cdoObject, oppositeObject, oppositeReference);
+  // }
+  // else
+  // {
+  // if (oppositeReference.isResolveProxies())
+  // {
+  // adjustTransientOppositeReference(instance, (InternalEObject)oppositeObject, oppositeReference);
+  // }
+  // }
+  // }
+  // }
 
   private void adjustPersistentOppositeReference(InternalCDOObject cdoObject, EObject oppositeObject,
       EReference oppositeReference)