Attachment #116162 for bug #251544

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.ecore.util.NotifyingInternalEListImpl;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;


  @SuppressWarnings("unchecked")
  public EList<EObject> getContents()
  {
    if (FSMUtil.isTransient(this))
    {
      EList<EObject> transientContents = (EList<EObject>)eSettings[EresourcePackage.CDO_RESOURCE__CONTENTS];
      if (transientContents == null)
      {
        transientContents = new TransientContents<EObject>();
        eSettings[EresourcePackage.CDO_RESOURCE__CONTENTS] = transientContents;
        // throw new ImplementationError();
      }

      return transientContents;
    }

    return (EList<EObject>)eGet(EresourcePackage.Literals.CDO_RESOURCE__CONTENTS, true);
  }


  {
    if (eStructuralFeature == EresourcePackage.eINSTANCE.getCDOResource_Contents())
    {
      return new ContentsCDOList(eStructuralFeature);
    }

    return super.createList(eStructuralFeature);

   * 
   * @ADDED
   * @author Eike Stepper
   * @since 2.0
   */
  protected class ContentsCDOList extends BasicEStoreEList<Object>
  {
    private static final long serialVersionUID = 1L;

    public ContentsCDOList(EStructuralFeature eStructuralFeature)
    public PersistentContents(EStructuralFeature eStructuralFeature)
    {
      super(CDOResourceImpl.this, eStructuralFeature);
      if (!cdoView().hasUniqueResourceContents())
      {
        kind &= ~IS_UNIQUE;
      }
    }

    /**

    @Override
    public boolean contains(Object object)
    {
      if (size() <= 4)
      {
        return super.contains(object);
      }

      return object instanceof InternalEObject && ((InternalEObject)object).eDirectResource() == CDOResourceImpl.this;
    }

    /**

    @Override
    public NotificationChain inverseAdd(Object object, NotificationChain notifications)
    {
      if (FSMUtil.isTransient(CDOResourceImpl.this))
      InternalCDOObject cdoObject = FSMUtil.adapt(object, transaction);
      notifications = cdoObject.eSetResource(CDOResourceImpl.this, notifications);
      // Attach here instead of i CDOObjectImpl.eSetResource because EMF does it also here
      if (FSMUtil.isTransient(cdoObject))
      {
        InternalEObject eObject = (InternalEObject)object;
        notifications = eObject.eSetResource(CDOResourceImpl.this, notifications);
      }
      else
      {
        CDOTransactionImpl transaction = cdoView().toTransaction();
        InternalCDOObject cdoObject = FSMUtil.adapt(object, transaction);
        notifications = cdoObject.eSetResource(CDOResourceImpl.this, notifications);

        // Attach here instead of in CDOObjectImpl.eSetResource because EMF does it also here
        if (FSMUtil.isTransient(cdoObject))
        {
          attached(cdoObject, transaction);
        }
      }

      return notifications;

    @Override
    public NotificationChain inverseRemove(Object object, NotificationChain notifications)
    {
      if (FSMUtil.isTransient(CDOResourceImpl.this))
      {
        InternalEObject eObject = (InternalEObject)object;
        notifications = eObject.eSetResource(null, notifications);
      }
      else
      {
        InternalEObject eObject = (InternalEObject)object;
        detached(eObject);
        notifications = eObject.eSetResource(null, notifications);
      }
   * @ADDED
   * @author Eike Stepper
   */
  protected class TransientContents<E extends Object & EObject> extends NotifyingInternalEListImpl<E>
  {
    private static final long serialVersionUID = 1L;

    public TransientContents()
    {
    }

    public TransientContents(Collection<? extends E> collection)
    {
      super(collection);
    }

      return notifications;
    {
      super(initialCapacity);
    }

    /**
     * Optimization taken from ResourceImpl.EContentList.contains
     * 
     * @since 2.0
     */
    protected void loaded()
    public boolean contains(Object object)
    {
      return size <= 4 ? super.contains(object) : object instanceof InternalEObject
          && ((InternalEObject)object).eDirectResource() == CDOResourceImpl.this;
    }

    @Override
    public Object getNotifier()
    {
      return CDOResourceImpl.this;
    }

    @Override
    public int getFeatureID()
    {
      if (!isLoaded())
      {
        Notification notification = setLoaded(true);
        if (notification != null)
        {
          eNotify(notification);
        }
      }
    }

    /**
     * @since 2.0
     */
    protected void modified()
    {
      if (isTrackingModification())
      {
        setModified(true);
      }
    }

    /**
     * @since 2.0
     */
    @Override
    protected boolean useEquals()
    {
      return false;
    }

    @Override
    protected boolean hasInverse()
    {
      return true;
    }

    @Override
    protected boolean isUnique()
    {
      return true;
    }

    /**
     * @since 2.0
     */
    /*
     * IMPORTANT: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
     * EMF with fixed bug #247130. These compile errors do not affect native models!
     */
    public InternalEList<E> readWriteFiringList()
    {
      return this;
    }

    @Override
    public NotificationChain inverseAdd(E object, NotificationChain notifications)
    {
      InternalEObject eObject = (InternalEObject)object;
      notifications = eObject.eSetResource(CDOResourceImpl.this, notifications);
      // CDOResourceImpl.this.attached(eObject);
      return notifications;
    }

    @Override
    public NotificationChain inverseRemove(E object, NotificationChain notifications)
    {
      InternalEObject eObject = (InternalEObject)object;
      // CDOResourceImpl.this.detached(eObject);
      return eObject.eSetResource(null, notifications);
    }

    @Override
    protected void didAdd(int index, E object)
    {
      super.didAdd(index, object);
      modified();
    }

    @Override
    protected boolean hasInverse()
    {
      super.didRemove(index, object);
      modified();
    }

    @Override
    protected void didSet(int index, E newObject, E oldObject)
    {
      super.didSet(index, newObject, oldObject);
      modified();
    }

    @Override
    protected void didClear(int oldSize, Object[] oldData)
    {
      return true;
      {
        loaded();
      }
      else
      {
        super.didClear(oldSize, oldData);
      }
    }

    /**
     * @since 2.0
     */
    @Override
    protected boolean isUnique()
      if (!isLoaded())
      {
        Notification notification = setLoaded(true);
        if (notification != null)
        {
          eNotify(notification);
        }
      }
    }

    protected void modified()
    {
      return true;
      {
        setModified(true);
      }
    }
  }
} // CDOResourceImpl




  public boolean hasConflict();

  /**
   * @see #setUniqueResourceContents(boolean)
   * @deprecated This performance tweak is not necessary with EMF 2.5 anymore and is likely to be removed when CDO
   *             reaches 2.0. In the meantime it can be safely used.
   */
  @Deprecated
  public boolean hasUniqueResourceContents();

  /**
   * Specifies whether the contents list of resources will be unique or not.
   * <p>
   * This property is transient in that it does not stick with resources outside of the scope of this view. Especially
   * it will not be persisted with resources in the repository. Each new view will start with <code>true</code> as a
   * default value. Changing to <code>false</code> will subsequently apply to all resources being loaded or created.
   * <p>
   * Notice that the resource contents is a containment list and as such <b>must be</b> unique. Setting this property to
   * <code>false</code> is only recommended for performance optimization when uniqueness is granted by other means.
   * Violating the uniqueness constraint will result in unpredictable behaviour and possible corruption of the
   * repository!
   * 
   * @deprecated This performance tweak is not necessary with EMF 2.5 anymore and is likely to be removed when CDO
   *             reaches 2.0. In the meantime it can be safely used.
   */
  @Deprecated
  public void setUniqueResourceContents(boolean uniqueResourceContents);

  /**
   * Returns <code>true</code> if the {@link CDOObject objects} in this view will notify their
   * {@link org.eclipse.emf.common.notify.Adapter adapters} about the fact that they are <em>invalidated</em> (due to
   * remote changes), <code>false</code> otherwise.





  private CDOURIHandler uriHandler = new CDOURIHandler(this);

  private boolean uniqueResourceContents = true;

  private boolean invalidationNotificationEnabled;

  private CDORevisionPrefetchingPolicy revisionPrefetchingPolicy;

    return false;
  }

  @Deprecated
  public boolean hasUniqueResourceContents()
  {
    return uniqueResourceContents;
  }

  @Deprecated
  public void setUniqueResourceContents(boolean uniqueResourceContents)
  {
    this.uniqueResourceContents = uniqueResourceContents;
  }

  /**
   * @since 2.0
   */

Lines 30-36 Link Here

(-)src/org/eclipse/emf/internal/cdo/CDOXATransactionCommitContext.java (-2 / +1 lines)
30	import java.util.HashMap;	30	import java.util.HashMap;
31	import java.util.List;	31	import java.util.List;
32	import java.util.Map;	32	import java.util.Map;
33	import java.util.Set;
34	import java.util.concurrent.Callable;	33	import java.util.concurrent.Callable;
35		34
36	/**	35	/**
Lines 112-118 Link Here
112	return delegateCommitContext.getNewResources();	111	return delegateCommitContext.getNewResources();
113	}	112	}
114		113
115	public Set<CDOID> getDetachedObjects()	114	public Map<CDOID, CDOObject> getDetachedObjects()
116	{	115	{
117	return delegateCommitContext.getDetachedObjects();	116	return delegateCommitContext.getDetachedObjects();
118	}	117	}




    return null;
  }

  private boolean isDetached(CDOID id)
  {
    return lastSavepoint.getSharedDetachedObjects().contains(id);
  }

  /**
   * @since 2.0
   */

      return null;
    }

    if (id.isTemporary() && isDetached(id))
    {
      FSMUtil.validate(id, null);
    }

    return super.getObject(id, loadOnDemand);
  }

  private boolean isDetached(CDOID id)
  {
    return lastSavepoint.getSharedDetachedObjects().contains(id);
  }

  /**
   * @since 2.0
   */

        }
      }

      // Rollback all persisted objects
      Map<CDOID, CDOObject> detachedObjects = itrSavepoint.getDetachedObjects();
      if (!detachedObjects.isEmpty())
      {

          {
            InternalCDOObject internalDirtyObject = (InternalCDOObject)entryDirty.getValue();
            cleanObject(internalDirtyObject, getRevision(entryDirty.getKey(), true));
            registerObject(internalDirtyObject);
          }
        }
      }

      for (Entry<CDOID, CDOObject> entryDirtyObject : itrSavepoint.getDirtyObjects().entrySet())
      {
        // Rollback all persisted objects
        if (!entryDirtyObject.getKey().isTemporary())
        {
          InternalCDOObject internalDirtyObject = (InternalCDOObject)entryDirtyObject.getValue();
          // cleanObject(internalDirtyObject, getRevision(entryDirtyObject.getKey(), true));
          CDOStateMachine.INSTANCE.rollback(internalDirtyObject);
        }
      }

    for (Entry<CDOID, CDOObject> entryNewObject : newObjMaps.entrySet())
    {
      InternalCDOObject object = (InternalCDOObject)entryNewObject.getValue();
      if (!isObjectRegistered(entryNewObject.getKey()))
      {
        registerObject(object);
      }

      // Go back to the previous state
      cleanObject(object, (InternalCDORevision)object.cdoRevision());

    }

    // deregister object
    deregisterObject(object);

    if (object.cdoState() == CDOState.NEW)
    {
      Map<CDOID, ? extends CDOObject> map = object instanceof CDOResource ? getLastSavepoint().getNewResources()

      // Determine if we added object
      if (map.containsKey(object.cdoID()))
      {
        // deregister object
        deregisterObject(object);
        map.remove(object.cdoID());
      }
      else


    private Map<CDOID, CDORevisionDelta> revisionDeltas;

    private Map<CDOID, CDOObject> detachedObjects;

    private List<CDOPackage> newPackages;


      newResources = transaction.getNewResources();
      newObjects = transaction.getNewObjects();
      dirtyObjects = transaction.getDirtyObjects();
      detachedObjects = transaction.getDetachedObjects();
      revisionDeltas = transaction.getRevisionDeltas();
      newPackages = transaction.analyzeNewPackages();
    }

      return newResources;
    }

    public Map<CDOID, CDOObject> getDetachedObjects()
    {
      return detachedObjects;
    }

          postCommit(getNewResources(), result);
          postCommit(getNewObjects(), result);
          postCommit(getDirtyObjects(), result);
          for (Entry<CDOID, CDOObject> entry : getDetachedObjects().entrySet())
          {
            removeObject(entry.getKey());
          }

          CDOSessionImpl session = getTransaction().getSession();

          for (CDOPackage newPackage : newPackages)
          {
            ((InternalCDOPackage)newPackage).setPersistent(true);

          ChangeSubscriptionManager changeSubscriptionManager = getTransaction().getChangeSubscriptionManager();
          changeSubscriptionManager.handleNewObjects(getNewObjects().values());
          changeSubscriptionManager.handleNewObjects(getNewResources().values());
          changeSubscriptionManager.handleDetachedObjects(getDetachedObjects().keySet());

          long timeStamp = result.getTimeStamp();



          if (!dirtyIDs.isEmpty() || !getDetachedObjects().isEmpty())
          {
            Set<CDOID> detachedIDs = new HashSet<CDOID>(getDetachedObjects().keySet());
            Collection<CDORevisionDelta> deltasCopy = new ArrayList<CDORevisionDelta>(deltas);
            session.handleCommitNotification(timeStamp, dirtyIDs, detachedIDs, deltasCopy, getTransaction());
          }




import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.BasicEMap;
import org.eclipse.emf.common.util.ECollections;
import org.eclipse.emf.common.util.EList;

import org.eclipse.emf.ecore.impl.EStoreEObjectImpl;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.Resource.Internal;
import org.eclipse.emf.ecore.util.DelegatingEcoreEList;
import org.eclipse.emf.ecore.util.DelegatingFeatureMap;
import org.eclipse.emf.ecore.util.EcoreEList;
import org.eclipse.emf.ecore.util.EcoreEMap;


  private InternalCDORevision revision;

  /**
   * CDO used this list instead of eSettings for transient objects. EMF used eSettings as cache. CDO deactivated the
   * cache but EMF still used eSettings to store list wrappers. CDO needs another place to store the real list with the
   * actual data (transient mode) and accessible through EStore. This allows CDO to always use the same instance of the
   * list wrapper.
   */
  private transient Object cdoSettings[];

  public CDOObjectImpl()
  {
    state = CDOState.TRANSIENT;
    eContainer = null;
    cdoSettings = null;
  }

  public CDOID cdoID()

    return revision;
  }

  /**
   * @since 2.0
   */
  protected Object[] cdoSettings()
  {
    if (cdoSettings == null)
    {
      int size = eClass().getFeatureCount() - eStaticFeatureCount();
      cdoSettings = size == 0 ? ENO_SETTINGS : new Object[size];
    }

    return cdoSettings;
  }

  /**
   * @since 2.0
   */
  protected Object[] cdoBasicSettings()
  {
    return cdoSettings;
  }

  public CDOClass cdoClass()
  {
    return getCDOClass(this);


  public void cdoInternalPostLoad()
  {
    // Reset EMAP objects
    if (eSettings != null)
    {
      // Make sure transient features are kept but persisted values are not cached.
      EClass eClass = eClass();
      for (int i = 0; i < eClass.getFeatureCount(); i++)
      {
        EStructuralFeature eFeature = cdoInternalDynamicFeature(i);

        // We need to keep the existing list if possible.
        if (!eFeature.isTransient() && eSettings[i] instanceof InternalCDOLoadable)
        {

   */
  public void cdoInternalCleanup()
  {
    // Do nothing
    {
      // Make sure transient feature are kept but persisted value are not cached.
      EClass eClass = eClass();
      for (int i = 0; i < eClass.getFeatureCount(); i++)
      {
        EStructuralFeature eFeature = cdoInternalDynamicFeature(i);
        // We need to keep the existing list if possible.
        if (!eFeature.isTransient())
        {
          eSettings[i] = null;
        }
      }
    }
  }

  public void cdoInternalPostAttach()

    CDOViewImpl view = cdoView();
    revision.setContainerID(eContainer == null ? CDOID.NULL : cdoView().convertObjectToID(eContainer, true));
    revision.setContainingFeatureID(eContainerFeatureID);

    Resource directResource = eDirectResource();
    if (directResource instanceof CDOResource)
    {

      revision.setResourceID(cdoResource.cdoID());
    }

    eSettings();

    EClass eClass = eClass();
    for (int i = 0; i < eClass.getFeatureCount(); i++)
    {

        populateRevisionFeature(view, revision, eFeature, eSettings, i);
      }
    }

    cdoSettings = null;
  }

  @SuppressWarnings("unchecked")

      TRACER.format("Populating feature {0}", cdoFeature);
    }

    Object setting = cdoBasicSettings() != null ? cdoSettings()[i] : null;
    if (setting == null)
    {
      setting = eFeature.getDefaultValue();


      revision.set(cdoFeature, 0, setting);
    }

    if (eSettings != null)
    {
      eSettings[i] = null;
    }
  }

  /**
   * It is really important for accessing the data to go through {@link #cdoStore()}. {@link #eStore()} will redirect
   * you to the transient data.
   */
  public void cdoInternalPostDetach()
  {
    if (TRACER.isEnabled())


    CDOViewImpl view = cdoView();
    super.eSetDirectResource(cdoDirectResource());

    CDOStore store = cdoStore();
    eContainer = store.getContainer(this);
    eContainerFeatureID = store.getContainingFeatureID(this);
    if (eContainer != null && eContainmentFeature().isResolveProxies())
    {
      adjustOppositeReference(eContainer, eContainmentFeature());
    }

    // Ensure that the internal eSettings array is initialized;
    resetSettings();

    EClass eClass = eClass();
    for (int i = 0; i < eClass.getFeatureCount(); i++)

    }
  }

  private void resetSettings()
  {
    cdoSettings = null;
    cdoSettings();
  }

  private void depopulateRevisionFeature(CDOViewImpl view, InternalCDORevision revision, EStructuralFeature eFeature,
      Object[] eSettings, int i)
  {

    EStructuralFeature.Internal internalFeature = (EStructuralFeature.Internal)eFeature;
    EReference oppositeReference = cdoID().isTemporary() ? null : internalFeature.getEOpposite();

    CDOStore cdoStore = cdoStore();
    EStore eStore = eStore();
    if (eFeature.isMany())
    {

      int size = cdoStore.size(this, eFeature);
      int size = eStore().size(this, eFeature);
      for (int index = 0; index < size; index++)
      {
        // Do not trigger events
        // Do not trigger inverse updates
        Object object = cdoStore.get(this, eFeature, index);
        eStore.add(this, eFeature, index, object);
        if (oppositeReference != null)
        {
          adjustOppositeReference((InternalEObject)object, oppositeReference);

    }
    else
    {
      Object object = cdoStore.get(this, eFeature, EStore.NO_INDEX);
      eStore.set(this, eFeature, EStore.NO_INDEX, object);
      if (oppositeReference != null)
      {
        adjustOppositeReference((InternalEObject)object, oppositeReference);
      }
    }
  }

        public EStoreEcoreEMap()
        {
          super((EClass)eType, eType.getInstanceClass(), null);
          delegateEList = new BasicEStoreEList<BasicEMap.Entry<Object, Object>>(CDOObjectImpl.this, eStructuralFeature)
          {
            private static final long serialVersionUID = 1L;



        private void checkListForReading()
        {
          if (!FSMUtil.isTransient(CDOObjectImpl.this))
          {
            CDOStateMachine.INSTANCE.read(CDOObjectImpl.this);
          }
        }

        /**

      return new EStoreEcoreEMap();
    }

    return super.createList(eStructuralFeature);
  }

  @Override

    }
    else if (resource instanceof CDOResourceImpl || resource == null)
    {
      cdoStore().setContainer(this, (CDOResourceImpl)resource, eInternalContainer(), eContainerFeatureID());
    }
    else
    {

      return super.eDirectResource();
    }

    return (Resource.Internal)cdoStore().getResource(this);
  }

  /**
   * @since 2.0
   */
  @Override
  public InternalEObject.EStore eStore()
  {
    return false;
  }

  @Override
  public Object dynamicGet(int dynamicFeatureID)
  {
    if (FSMUtil.isTransient(this))
    {
      if (eSettings == null)
      {
        return null;
      }

      return eSettings[dynamicFeatureID];
    }

    // Delegate to CDOStore
    return super.dynamicGet(dynamicFeatureID);
  }

  @Override
  public boolean eIsSet(EStructuralFeature feature)
  {
    if (FSMUtil.isTransient(this))
    {
      return CDOStoreSettingsImpl.INSTANCE;
      if (eSettings == null)
      {
        return false;
      }

      return eSettings[eDynamicFeatureID(feature)] != null;
    }

    return cdoStore();
    return super.eIsSet(feature);
  }

  @Override
  public void dynamicSet(int dynamicFeatureID, Object value)
  {
    if (FSMUtil.isTransient(this))
    {
      eSettings(); // Important to create eSettings array if necessary
      eSettings[dynamicFeatureID] = value;
    }
    else
    {
      // Delegate to CDOStore
      super.dynamicSet(dynamicFeatureID, value);
    }
  }

  /**
   * Don't cache non-transient features in this CDOObject's {@link #eSettings()}.
   */
  @Override
  protected boolean eIsCaching()
  {
    return false;
    {
      if (eSettings != null)
      {
        eSettings[dynamicFeatureID] = null;
      }
    }
    else
    {
      // Delegate to CDOStore
      super.dynamicUnset(dynamicFeatureID);
    }
  }

  @Override

    else
    {
      // Delegate to CDOStore
      container = cdoStore().getContainer(this);
    }

    if (container instanceof CDOResource)

    }

    // Delegate to CDOStore
    return cdoStore().getContainingFeatureID(this);
  }

  /**

    }
    else
    {
      cdoStore().setContainer(this, cdoDirectResource(), newEContainer, newContainerFeatureID);
    }
  }


    return ModelUtil.getCDOClass(cdoObject.eClass(), packageManager);
  }

  private CDOStore cdoStore()
  {
    return cdoView().getStore();
  }

  /**
   * TODO Remove this when EMF has fixed http://bugs.eclipse.org/197487
   * 
   * @author Eike Stepper
   * @since 2.0
   */
  public static class CDOStoreSettingsImpl implements InternalEObject.EStore
  {
    public static CDOStoreSettingsImpl INSTANCE = new CDOStoreSettingsImpl();

    private CDOStoreSettingsImpl()
    {
      super(CDOObjectImpl.this, eStructuralFeature);
    }

    protected Object getValue(InternalEObject eObject, int dynamicFeatureID)
    protected List<E> delegateList()
    {
      return ((CDOObjectImpl)eObject).cdoSettings()[dynamicFeatureID];

    }

    protected EList<Object> getValueAsList(InternalEObject eObject, int dynamicFeatureID)
    public EStructuralFeature getEStructuralFeature()
    {
      @SuppressWarnings("unchecked")
      EList<Object> result = (EList<Object>)getValue(eObject, dynamicFeatureID);
      if (result == null)
      {
        result = new BasicEList<Object>();
        ((CDOObjectImpl)eObject).cdoSettings()[dynamicFeatureID] = result;
      }

      return result;
    }

    protected Object setValue(InternalEObject eObject, int dynamicFeatureID, Object newValue)
    protected void delegateAdd(int index, Object object)
    {
      Object eSettings[] = ((CDOObjectImpl)eObject).cdoSettings();

      try
      {
        return eSettings[dynamicFeatureID];
      }
      finally
      {
        eSettings[dynamicFeatureID] = newValue;
      }
    }

    protected int eDynamicFeatureID(InternalEObject eObject, EStructuralFeature feature)
    protected void delegateAdd(Object object)
    {
      return ((CDOObjectImpl)eObject).eDynamicFeatureID(feature);
    }

    public Object get(InternalEObject eObject, EStructuralFeature feature, int index)
    protected List<E> delegateBasicList()
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      if (feature.isMany())
      {
        return getValueAsList(eObject, dynamicFeatureID).get(index);
      }

      return getValue(eObject, dynamicFeatureID);
      return new EcoreEList.UnmodifiableEList<E>(owner, eStructuralFeature, data.length, data);
    }

    public Object set(InternalEObject eObject, EStructuralFeature feature, int index, Object value)
    protected void delegateClear()
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      if (feature.isMany())
      {
        return getValueAsList(eObject, dynamicFeatureID).set(index, value);
      }

      return setValue(eObject, dynamicFeatureID, value);
    }

    public void add(InternalEObject eObject, EStructuralFeature feature, int index, Object value)
    protected boolean delegateContains(Object object)
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      getValueAsList(eObject, dynamicFeatureID).add(index, value);
    }

    public Object remove(InternalEObject eObject, EStructuralFeature feature, int index)
    protected boolean delegateContainsAll(Collection<?> collection)
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).remove(index);
        if (!delegateContains(o))
        {
          return false;
        }
      }
      return true;
    }

    public Object move(InternalEObject eObject, EStructuralFeature feature, int targetIndex, int sourceIndex)
    @Override
    protected E delegateGet(int index)
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).move(targetIndex, sourceIndex);
    }

    public void clear(InternalEObject eObject, EStructuralFeature feature)
    protected int delegateHashCode()
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      if (feature.isMany())
      {
        getValueAsList(eObject, dynamicFeatureID).clear();
      }

      setValue(eObject, dynamicFeatureID, null);
    }

    public int size(InternalEObject eObject, EStructuralFeature feature)
    protected int delegateIndexOf(Object object)
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).size();
    }

    public int indexOf(InternalEObject eObject, EStructuralFeature feature, Object value)
    protected boolean delegateIsEmpty()
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).indexOf(value);
    }

    public int lastIndexOf(InternalEObject eObject, EStructuralFeature feature, Object value)
    protected Iterator<E> delegateIterator()
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).lastIndexOf(value);
    }

    public Object[] toArray(InternalEObject eObject, EStructuralFeature feature)
    protected int delegateLastIndexOf(Object object)
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).toArray();
    }

    public <T> T[] toArray(InternalEObject eObject, EStructuralFeature feature, T[] array)
    protected ListIterator<E> delegateListIterator()
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).toArray(array);
    }

    public boolean isEmpty(InternalEObject eObject, EStructuralFeature feature)
    @Override
    protected E delegateRemove(int index)
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).isEmpty();
    }

    public boolean contains(InternalEObject eObject, EStructuralFeature feature, Object value)
    @Override
    protected E delegateSet(int index, E object)
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).contains(value);
    }

    public int hashCode(InternalEObject eObject, EStructuralFeature feature)
    protected int delegateSize()
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValueAsList(eObject, dynamicFeatureID).hashCode();
    }

    public InternalEObject getContainer(InternalEObject eObject)
    protected Object[] delegateToArray()
    {
      return null;
    }

    public EStructuralFeature getContainingFeature(InternalEObject eObject)
    protected <T> T[] delegateToArray(T[] array)
    {
      // This should never be called.
      throw new UnsupportedOperationException();
    }

    public EObject create(EClass eClass)
    @Override
    protected E delegateMove(int targetIndex, int sourceIndex)
    {
      return new EStoreEObjectImpl(eClass, this);
    }

    public boolean isSet(InternalEObject eObject, EStructuralFeature feature)
    protected boolean delegateEquals(Object object)
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      return getValue(eObject, dynamicFeatureID) != null;
        return true;
      }

      if (!(object instanceof List))
      {
        return false;
      }

      List<?> list = (List<?>)object;
      if (list.size() != delegateSize())
      {
        return false;
      }

      for (ListIterator<?> i = list.listIterator(); i.hasNext();)
      {
        Object element = i.next();
        if (element == null ? get(i.previousIndex()) != null : !element.equals(get(i.previousIndex())))
        {
          return false;
        }
      }

      return true;
    }

    public void unset(InternalEObject eObject, EStructuralFeature feature)
    protected String delegateToString()
    {
      int dynamicFeatureID = eDynamicFeatureID(eObject, feature);
      setValue(eObject, dynamicFeatureID, null);
      for (int i = 0, size = size(); i < size;)
      {
        Object value = delegateGet(i);
        stringBuffer.append(String.valueOf(value));
        if (++i < size)
        {
          stringBuffer.append(", ");
        }
      }
      stringBuffer.append("]");
      return stringBuffer.toString();
    }
  }


    @Override
    protected void delegateAdd(int index, Entry object)
    {
      eStore().add(owner, eStructuralFeature, index, object);
    }

    @Override

        return ECollections.emptyEList();
      }

      Object[] data = cdoStore().toArray(owner, eStructuralFeature);
      return new EcoreEList.UnmodifiableEList<FeatureMap.Entry>(owner, eStructuralFeature, data.length, data);
    }

    @Override
    protected void delegateClear()
    {
      eStore().clear(owner, eStructuralFeature);
    }

    @Override
    protected boolean delegateContains(Object object)
    {
      return eStore().contains(owner, eStructuralFeature, object);
    }

    @Override

          return false;
        }
      }

      return true;
    }

    @Override
    protected Entry delegateGet(int index)
    {
      return (Entry)eStore().get(owner, eStructuralFeature, index);
    }

    @Override
    protected int delegateHashCode()
    {
      return eStore().hashCode(owner, eStructuralFeature);
    }

    @Override
    protected int delegateIndexOf(Object object)
    {
      return eStore().indexOf(owner, eStructuralFeature, object);
    }

    @Override
    protected boolean delegateIsEmpty()
    {
      return eStore().isEmpty(owner, eStructuralFeature);
    }

    @Override

    @Override
    protected int delegateLastIndexOf(Object object)
    {
      return eStore().lastIndexOf(owner, eStructuralFeature, object);
    }

    @Override

    @Override
    protected Entry delegateRemove(int index)
    {
      return (Entry)eStore().remove(owner, eStructuralFeature, index);
    }

    @Override
    protected Entry delegateSet(int index, Entry object)
    {
      return (Entry)eStore().set(owner, eStructuralFeature, index, object);
    }

    @Override
    protected int delegateSize()
    {
      return eStore().size(owner, eStructuralFeature);
    }

    @Override
    protected Object[] delegateToArray()
    {
      return eStore().toArray(owner, eStructuralFeature);
    }

    @Override
    protected <T> T[] delegateToArray(T[] array)
    {
      return eStore().toArray(owner, eStructuralFeature, array);
    }

    @Override
    protected Entry delegateMove(int targetIndex, int sourceIndex)
    {
      return (Entry)eStore().move(owner, eStructuralFeature, targetIndex, sourceIndex);
    }

    @Override

          stringBuffer.append(", ");
        }
      }

      stringBuffer.append("]");
      return stringBuffer.toString();
    }

Lines 21-27 Link Here

(-)src/org/eclipse/emf/internal/cdo/CDOCommitContext.java (-2 / +1 lines)
21		21
22	import java.util.List;	22	import java.util.List;
23	import java.util.Map;	23	import java.util.Map;
24	import java.util.Set;
25		24
26	/**	25	/**
27	* Provides a context for a commit operation.	26	* Provides a context for a commit operation.
Lines 45-51 Link Here
45		44
46	public Map<CDOID, CDOObject> getDirtyObjects();	45	public Map<CDOID, CDOObject> getDirtyObjects();
47		46
48	public Set<CDOID> getDetachedObjects();	47	public Map<CDOID, CDOObject> getDetachedObjects();
49		48
50	public Map<CDOID, CDORevisionDelta> getRevisionDeltas();	49	public Map<CDOID, CDORevisionDelta> getRevisionDeltas();
51	}	50	}

Lines 103-109 Link Here

(-)src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java (-1 / +1 lines)
103	Collection<CDOResource> newResources = commitContext.getNewResources().values();	103	Collection<CDOResource> newResources = commitContext.getNewResources().values();
104	Collection<CDOObject> newObjects = commitContext.getNewObjects().values();	104	Collection<CDOObject> newObjects = commitContext.getNewObjects().values();
105	Collection<CDORevisionDelta> revisionDeltas = commitContext.getRevisionDeltas().values();	105	Collection<CDORevisionDelta> revisionDeltas = commitContext.getRevisionDeltas().values();
106	Collection<CDOID> detachedObjects = commitContext.getDetachedObjects();	106	Collection<CDOID> detachedObjects = commitContext.getDetachedObjects().keySet();
107		107
108	out.writeInt(newPackages.size());	108	out.writeInt(newPackages.size());
109	out.writeInt(newResources.size() + newObjects.size());	109	out.writeInt(newResources.size() + newObjects.size());




import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246442_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246456_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246622_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_248052_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_248124_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_248915_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_250036_Test;

import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_250910_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251087_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251263_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251544_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251752_Test;
import org.eclipse.emf.cdo.tests.config.ConfigTest;
import org.eclipse.emf.cdo.tests.config.ConfigTestSuite;

    testClasses.add(Bugzilla_246442_Test.class);
    testClasses.add(Bugzilla_246456_Test.class);
    testClasses.add(Bugzilla_246622_Test.class);
    testClasses.add(Bugzilla_248052_Test.class);
    testClasses.add(Bugzilla_248124_Test.class);
    testClasses.add(Bugzilla_248915_Test.class);
    testClasses.add(Bugzilla_250036_Test.class);
    testClasses.add(Bugzilla_250757_Test.class);
    testClasses.add(Bugzilla_250910_Test.class);
    testClasses.add(Bugzilla_251087_Test.class);
    testClasses.add(Bugzilla_251263_Test.class);
    testClasses.add(Bugzilla_251544_Test.class);
    testClasses.add(Bugzilla_251752_Test.class);
    testClasses.add(Bugzilla_250910_Test.class);

    // TODO testClasses.add(NonCDOResourceTest.class);
    // TODO testClasses.add(GeneratedEcoreTest.class);

Lines 57-62 Link Here

(-)src/org/eclipse/emf/cdo/tests/DetachTest.java (-13 / +23 lines)
57	assertNull(transaction.getResourceSet().getEObject(uriC1, false));	57	assertNull(transaction.getResourceSet().getEObject(uriC1, false));
58		58
59	transaction.commit();	59	transaction.commit();
		60	assertNull(transaction.getResourceSet().getEObject(uriC1, false));
		61	session.close();
60	}	62	}
61		63
62	public void testCleanObjectDeletion() throws Exception	64	public void testCleanObjectDeletion() throws Exception
Lines 76-93 Link Here
76		78
77	resource.getContents().remove(c1);	79	resource.getContents().remove(c1);
78	assertTransient(c1);	80	assertTransient(c1);
		81	assertSame(c1, transaction.getObject(id));
		82	assertSame(c1, transaction.getResourceSet().getEObject(uriC1, false));
79		83
80	try
81	{
82	transaction.getObject(id);
83	fail("ObjectNotFoundException expected");
84	}
85	catch (ObjectNotFoundException expected)
86	{
87	// SUCCESS
88	}
89
90	assertNull(transaction.getResourceSet().getEObject(uriC1, false));
91	transaction.commit();	84	transaction.commit();
92	assertTransient(c1);	85	assertTransient(c1);
93		86
Lines 102-107 Link Here
102	}	95	}
103		96
104	assertNull(transaction.getResourceSet().getEObject(uriC1, false));	97	assertNull(transaction.getResourceSet().getEObject(uriC1, false));
		98	session.close();
105	}	99	}
106		100
107	public void testSavePointNewObjectDeletion() throws Exception	101	public void testSavePointNewObjectDeletion() throws Exception
Lines 149-164 Link Here
149		143
150	CDOSavepoint savepoint2 = transaction.setSavepoint();	144	CDOSavepoint savepoint2 = transaction.setSavepoint();
151	c1.setName("SIMON2");	145	c1.setName("SIMON2");
152	assertNull(transaction.getResourceSet().getEObject(uriC1, false));	146	if (isPersisted)
		147	{
		148	assertNotNull(transaction.getResourceSet().getEObject(uriC1, false));
		149	}
		150	else
		151	{
		152	assertNull(transaction.getResourceSet().getEObject(uriC1, false));
		153	}
153		154
154	savepoint2.rollback();	155	savepoint2.rollback();
155	assertEquals("SIMON2", c1.getName());	156	assertEquals("SIMON2", c1.getName());
156	assertTransient(c1);	157	assertTransient(c1);
157	assertNull(transaction.getResourceSet().getEObject(uriC1, false));	158
		159	if (isPersisted)
		160	{
		161	assertNotNull(transaction.getResourceSet().getEObject(uriC1, false));
		162	}
		163	else
		164	{
		165	assertNull(transaction.getResourceSet().getEObject(uriC1, false));
		166	}
158		167
159	savepoint.rollback();	168	savepoint.rollback();
160	assertEquals("SIMON", c1.getName());	169	assertEquals("SIMON", c1.getName());
161	assertEquals(c1, transaction.getResourceSet().getEObject(uriC1, false));	170	assertEquals(c1, transaction.getResourceSet().getEObject(uriC1, false));
		171
162	if (isPersisted)	172	if (isPersisted)
163	{	173	{
164	assertDirty(c1, transaction);	174	assertDirty(c1, transaction);




    }
  }

  @SuppressWarnings("deprecation")
  public void testCreateManyTransactions() throws Exception
  {
    msg("Opening session");

      msg("Transaction " + i + "    (" + lastDuration + ")");
      lastDuration = System.currentTimeMillis();
      transaction = session.openTransaction();
      transaction.setUniqueResourceContents(false);
      resource = transaction.getResource("/test2");

      Category category = getModel1Factory().createCategory();
      resource.getContents().add(category);
      transaction.commit();

Lines 24-30 Link Here

(-)src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246456_Test.java (-2 lines)
24	*/	24	*/
25	public class Bugzilla_246456_Test extends AbstractCDOTest	25	public class Bugzilla_246456_Test extends AbstractCDOTest
26	{	26	{
27	@SuppressWarnings("deprecation")
28	public void testBugzilla_246456() throws Exception	27	public void testBugzilla_246456() throws Exception
29	{	28	{
30	msg("Opening session");	29	msg("Opening session");
Lines 36-42 Link Here
36	.setCapacityRevised(10);	35	.setCapacityRevised(10);
37	((LRURevisionCache)((TwoLevelRevisionCache)transaction.getSession().getRevisionManager().getCache()).getLevel1())	36	((LRURevisionCache)((TwoLevelRevisionCache)transaction.getSession().getRevisionManager().getCache()).getLevel1())
38	.setCapacityCurrent(10);	37	.setCapacityCurrent(10);
39	transaction.setUniqueResourceContents(false);
40		38
41	msg("Creating resource");	39	msg("Creating resource");
42	CDOResource resource = transaction.createResource("/test1");	40	CDOResource resource = transaction.createResource("/test1");




package org.eclipse.emf.cdo.tests.bugzilla;

import org.eclipse.emf.cdo.CDOSession;
import org.eclipse.emf.cdo.CDOTransaction;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.tests.AbstractCDOTest;
import org.eclipse.emf.cdo.tests.model1.Order;
import org.eclipse.emf.cdo.tests.model1.OrderDetail;
import org.eclipse.emf.cdo.tests.model1.Product1;

import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;

/**
 * Resources fetched using CDOViewImpl.getResource(CDOID) not added to ResourceSet
 * <p>
 * See https://bugs.eclipse.org/251544
 * 
 * @author Simon McDuff
 */
public class Bugzilla_251544_Test extends AbstractCDOTest
{
  public void testFromPersistedToTransient() throws Exception
  {
    CDOSession session = openModel1Session();
    CDOTransaction transaction = session.openTransaction();
    CDOResource resource = transaction.createResource("/my/resource");

    Order order1 = getModel1Factory().createOrder();
    OrderDetail orderDetail = getModel1Factory().createOrderDetail();
    Product1 product = getModel1Factory().createProduct1();
    EList<EObject> contentList = resource.getContents();
    resource.getContents().add(order1);
    order1.getOrderDetails().add(orderDetail);
    orderDetail.setProduct(product);

    EList<OrderDetail> list = order1.getOrderDetails();
    // 
    resource.getContents().remove(0); // remove object by index
    list.remove(orderDetail);
    transaction.commit();

    resource.delete(null);

    assertSame(contentList, resource.getContents());
  }

  public void testFromTransientToPersisted() throws Exception
  {
    CDOSession session = openModel1Session();
    CDOTransaction transaction = session.openTransaction();
    CDOResource resource = transaction.createResource("/my/resource");

    Order order1 = getModel1Factory().createOrder();
    OrderDetail orderDetail = getModel1Factory().createOrderDetail();
    EList<OrderDetail> orderDetails = order1.getOrderDetails();
    order1.getOrderDetails().add(orderDetail);

    msg("Persist the graph");
    resource.getContents().add(order1);
    assertSame(orderDetails, order1.getOrderDetails());
    resource.getContents().remove(0); // remove object by index
    assertSame(orderDetails, order1.getOrderDetails());
    assertEquals(true, orderDetails.remove(orderDetail));
    transaction.commit();
  }

}

Return to bug 251544

Lines 399-409 Link Here

(-)src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java (-22 / +19 lines)
399	return null;	399	return null;
400	}	400	}
401		401
402	private boolean isDetached(CDOID id)
403	{
404	return lastSavepoint.getSharedDetachedObjects().contains(id);
405	}
406
407	/**	402	/**
408	* @since 2.0	403	* @since 2.0
409	*/	404	*/
Lines 416-422 Link Here
416	return null;	411	return null;
417	}	412	}
418		413
419	if (isDetached(id))	414	if (id.isTemporary() && isDetached(id))
420	{	415	{
421	FSMUtil.validate(id, null);	416	FSMUtil.validate(id, null);
422	}	417	}
Lines 424-429 Link Here
424	return super.getObject(id, loadOnDemand);	419	return super.getObject(id, loadOnDemand);
425	}	420	}
426		421
		422	private boolean isDetached(CDOID id)
		423	{
		424	return lastSavepoint.getSharedDetachedObjects().contains(id);
		425	}
		426
427	/**	427	/**
428	* @since 2.0	428	* @since 2.0
429	*/	429	*/
Lines 505-511 Link Here
505	}	505	}
506	}	506	}
507		507
508	// Rollback every persisted objects	508	// Rollback all persisted objects
509	Map<CDOID, CDOObject> detachedObjects = itrSavepoint.getDetachedObjects();	509	Map<CDOID, CDOObject> detachedObjects = itrSavepoint.getDetachedObjects();
510	if (!detachedObjects.isEmpty())	510	if (!detachedObjects.isEmpty())
511	{	511	{
Lines 519-536 Link Here
519	{	519	{
520	InternalCDOObject internalDirtyObject = (InternalCDOObject)entryDirty.getValue();	520	InternalCDOObject internalDirtyObject = (InternalCDOObject)entryDirty.getValue();
521	cleanObject(internalDirtyObject, getRevision(entryDirty.getKey(), true));	521	cleanObject(internalDirtyObject, getRevision(entryDirty.getKey(), true));
522	registerObject(internalDirtyObject);
523	}	522	}
524	}	523	}
525	}	524	}
526		525
527	for (Entry<CDOID, CDOObject> entryDirtyObject : itrSavepoint.getDirtyObjects().entrySet())	526	for (Entry<CDOID, CDOObject> entryDirtyObject : itrSavepoint.getDirtyObjects().entrySet())
528	{	527	{
529	// Rollback every persisted objects	528	// Rollback all persisted objects
530	if (!entryDirtyObject.getKey().isTemporary())	529	if (!entryDirtyObject.getKey().isTemporary())
531	{	530	{
532	InternalCDOObject internalDirtyObject = (InternalCDOObject)entryDirtyObject.getValue();	531	InternalCDOObject internalDirtyObject = (InternalCDOObject)entryDirtyObject.getValue();
533	// cleanObject(internalDirtyObject, getRevision(entryDirtyObject.getKey(), true));
534	CDOStateMachine.INSTANCE.rollback(internalDirtyObject);	532	CDOStateMachine.INSTANCE.rollback(internalDirtyObject);
535	}	533	}
536	}	534	}
Lines 585-594 Link Here
585	for (Entry<CDOID, CDOObject> entryNewObject : newObjMaps.entrySet())	583	for (Entry<CDOID, CDOObject> entryNewObject : newObjMaps.entrySet())
586	{	584	{
587	InternalCDOObject object = (InternalCDOObject)entryNewObject.getValue();	585	InternalCDOObject object = (InternalCDOObject)entryNewObject.getValue();
588	if (!isObjectRegistered(entryNewObject.getKey()))
589	{
590	registerObject(object);
591	}
592		586
593	// Go back to the previous state	587	// Go back to the previous state
594	cleanObject(object, (InternalCDORevision)object.cdoRevision());	588	cleanObject(object, (InternalCDORevision)object.cdoRevision());
Lines 648-655 Link Here
648	}	642	}
649		643
650	// deregister object	644	// deregister object
651	deregisterObject(object);
652
653	if (object.cdoState() == CDOState.NEW)	645	if (object.cdoState() == CDOState.NEW)
654	{	646	{
655	Map<CDOID, ? extends CDOObject> map = object instanceof CDOResource ? getLastSavepoint().getNewResources()	647	Map<CDOID, ? extends CDOObject> map = object instanceof CDOResource ? getLastSavepoint().getNewResources()
Lines 658-663 Link Here
658	// Determine if we added object	650	// Determine if we added object
659	if (map.containsKey(object.cdoID()))	651	if (map.containsKey(object.cdoID()))
660	{	652	{
		653	// deregister object
		654	deregisterObject(object);
661	map.remove(object.cdoID());	655	map.remove(object.cdoID());
662	}	656	}
663	else	657	else
Lines 1017-1023 Link Here
1017		1011
1018	private Map<CDOID, CDORevisionDelta> revisionDeltas;	1012	private Map<CDOID, CDORevisionDelta> revisionDeltas;
1019		1013
1020	private Set<CDOID> detachedObjects;	1014	private Map<CDOID, CDOObject> detachedObjects;
1021		1015
1022	private List<CDOPackage> newPackages;	1016	private List<CDOPackage> newPackages;
1023		1017
Lines 1027-1033 Link Here
1027	newResources = transaction.getNewResources();	1021	newResources = transaction.getNewResources();
1028	newObjects = transaction.getNewObjects();	1022	newObjects = transaction.getNewObjects();
1029	dirtyObjects = transaction.getDirtyObjects();	1023	dirtyObjects = transaction.getDirtyObjects();
1030	detachedObjects = transaction.getDetachedObjects().keySet();	1024	detachedObjects = transaction.getDetachedObjects();
1031	revisionDeltas = transaction.getRevisionDeltas();	1025	revisionDeltas = transaction.getRevisionDeltas();
1032	newPackages = transaction.analyzeNewPackages();	1026	newPackages = transaction.analyzeNewPackages();
1033	}	1027	}
Lines 1052-1058 Link Here
1052	return newResources;	1046	return newResources;
1053	}	1047	}
1054		1048
1055	public Set<CDOID> getDetachedObjects()	1049	public Map<CDOID, CDOObject> getDetachedObjects()
1056	{	1050	{
1057	return detachedObjects;	1051	return detachedObjects;
1058	}	1052	}
Lines 1109-1117 Link Here
1109	postCommit(getNewResources(), result);	1103	postCommit(getNewResources(), result);
1110	postCommit(getNewObjects(), result);	1104	postCommit(getNewObjects(), result);
1111	postCommit(getDirtyObjects(), result);	1105	postCommit(getDirtyObjects(), result);
		1106	for (Entry<CDOID, CDOObject> entry : getDetachedObjects().entrySet())
		1107	{
		1108	removeObject(entry.getKey());
		1109	}
1112		1110
1113	CDOSessionImpl session = getTransaction().getSession();	1111	CDOSessionImpl session = getTransaction().getSession();
1114
1115	for (CDOPackage newPackage : newPackages)	1112	for (CDOPackage newPackage : newPackages)
1116	{	1113	{
1117	((InternalCDOPackage)newPackage).setPersistent(true);	1114	((InternalCDOPackage)newPackage).setPersistent(true);
Lines 1120-1126 Link Here
1120	ChangeSubscriptionManager changeSubscriptionManager = getTransaction().getChangeSubscriptionManager();	1117	ChangeSubscriptionManager changeSubscriptionManager = getTransaction().getChangeSubscriptionManager();
1121	changeSubscriptionManager.handleNewObjects(getNewObjects().values());	1118	changeSubscriptionManager.handleNewObjects(getNewObjects().values());
1122	changeSubscriptionManager.handleNewObjects(getNewResources().values());	1119	changeSubscriptionManager.handleNewObjects(getNewResources().values());
1123	changeSubscriptionManager.handleDetachedObjects(getDetachedObjects());	1120	changeSubscriptionManager.handleDetachedObjects(getDetachedObjects().keySet());
1124		1121
1125	long timeStamp = result.getTimeStamp();	1122	long timeStamp = result.getTimeStamp();
1126		1123
Lines 1135-1141 Link Here
1135		1132
1136	if (!dirtyIDs.isEmpty() \|\| !getDetachedObjects().isEmpty())	1133	if (!dirtyIDs.isEmpty() \|\| !getDetachedObjects().isEmpty())
1137	{	1134	{
1138	Set<CDOID> detachedIDs = new HashSet<CDOID>(getDetachedObjects());	1135	Set<CDOID> detachedIDs = new HashSet<CDOID>(getDetachedObjects().keySet());
1139	Collection<CDORevisionDelta> deltasCopy = new ArrayList<CDORevisionDelta>(deltas);	1136	Collection<CDORevisionDelta> deltasCopy = new ArrayList<CDORevisionDelta>(deltas);
1140	session.handleCommitNotification(timeStamp, dirtyIDs, detachedIDs, deltasCopy, getTransaction());	1137	session.handleCommitNotification(timeStamp, dirtyIDs, detachedIDs, deltasCopy, getTransaction());
1141	}	1138	}

Lines 48-59 Link Here

(-)src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java (-167 / +63 lines)
48	import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;	48	import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
49	import org.eclipse.emf.ecore.resource.impl.ResourceImpl;	49	import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
50	import org.eclipse.emf.ecore.util.InternalEList;	50	import org.eclipse.emf.ecore.util.InternalEList;
51	import org.eclipse.emf.ecore.util.NotifyingInternalEListImpl;
52		51
53	import java.io.IOException;	52	import java.io.IOException;
54	import java.io.InputStream;	53	import java.io.InputStream;
55	import java.io.OutputStream;	54	import java.io.OutputStream;
56	import java.util.Collection;
57	import java.util.Iterator;	55	import java.util.Iterator;
58	import java.util.Map;	56	import java.util.Map;
59		57
Lines 257-275 Link Here
257	@SuppressWarnings("unchecked")	255	@SuppressWarnings("unchecked")
258	public EList<EObject> getContents()	256	public EList<EObject> getContents()
259	{	257	{
260	if (FSMUtil.isTransient(this))
261	{
262	EList<EObject> transientContents = (EList<EObject>)eSettings[EresourcePackage.CDO_RESOURCE__CONTENTS];
263	if (transientContents == null)
264	{
265	transientContents = new TransientContents<EObject>();
266	eSettings[EresourcePackage.CDO_RESOURCE__CONTENTS] = transientContents;
267	// throw new ImplementationError();
268	}
269
270	return transientContents;
271	}
272
273	return (EList<EObject>)eGet(EresourcePackage.Literals.CDO_RESOURCE__CONTENTS, true);	258	return (EList<EObject>)eGet(EresourcePackage.Literals.CDO_RESOURCE__CONTENTS, true);
274	}	259	}
275		260
Lines 846-852 Link Here
846	{	831	{
847	if (eStructuralFeature == EresourcePackage.eINSTANCE.getCDOResource_Contents())	832	if (eStructuralFeature == EresourcePackage.eINSTANCE.getCDOResource_Contents())
848	{	833	{
849	return new PersistentContents(eStructuralFeature);	834	return new ContentsCDOList(eStructuralFeature);
850	}	835	}
851		836
852	return super.createList(eStructuralFeature);	837	return super.createList(eStructuralFeature);
Lines 857-875 Link Here
857	*	842	*
858	* @ADDED	843	* @ADDED
859	* @author Eike Stepper	844	* @author Eike Stepper
		845	* @since 2.0
860	*/	846	*/
861	protected class PersistentContents extends CDOStoreEList<Object>	847	protected class ContentsCDOList extends BasicEStoreEList<Object>
862	{	848	{
863	private static final long serialVersionUID = 1L;	849	private static final long serialVersionUID = 1L;
864		850
865	@SuppressWarnings("deprecation")	851	public ContentsCDOList(EStructuralFeature eStructuralFeature)
866	public PersistentContents(EStructuralFeature eStructuralFeature)
867	{	852	{
868	super(eStructuralFeature);	853	super(CDOResourceImpl.this, eStructuralFeature);
869	if (!cdoView().hasUniqueResourceContents())
870	{
871	kind &= ~IS_UNIQUE;
872	}
873	}	854	}
874		855
875	/**	856	/**
Lines 880-887 Link Here
880	@Override	861	@Override
881	public boolean contains(Object object)	862	public boolean contains(Object object)
882	{	863	{
883	return size() <= 4 ? super.contains(object) : object instanceof InternalEObject	864	if (size() <= 4)
884	&& ((InternalEObject)object).eDirectResource() == CDOResourceImpl.this;	865	{
		866	return super.contains(object);
		867	}
		868
		869	return object instanceof InternalEObject && ((InternalEObject)object).eDirectResource() == CDOResourceImpl.this;
885	}	870	}
886		871
887	/**	872	/**
Lines 890-902 Link Here
890	@Override	875	@Override
891	public NotificationChain inverseAdd(Object object, NotificationChain notifications)	876	public NotificationChain inverseAdd(Object object, NotificationChain notifications)
892	{	877	{
893	CDOTransactionImpl transaction = cdoView().toTransaction();	878	if (FSMUtil.isTransient(CDOResourceImpl.this))
894	InternalCDOObject cdoObject = FSMUtil.adapt(object, transaction);
895	notifications = cdoObject.eSetResource(CDOResourceImpl.this, notifications);
896	// Attach here instead of i CDOObjectImpl.eSetResource because EMF does it also here
897	if (FSMUtil.isTransient(cdoObject))
898	{	879	{
899	attached(cdoObject, transaction);	880	InternalEObject eObject = (InternalEObject)object;
		881	notifications = eObject.eSetResource(CDOResourceImpl.this, notifications);
		882	}
		883	else
		884	{
		885	CDOTransactionImpl transaction = cdoView().toTransaction();
		886	InternalCDOObject cdoObject = FSMUtil.adapt(object, transaction);
		887	notifications = cdoObject.eSetResource(CDOResourceImpl.this, notifications);
		888
		889	// Attach here instead of in CDOObjectImpl.eSetResource because EMF does it also here
		890	if (FSMUtil.isTransient(cdoObject))
		891	{
		892	attached(cdoObject, transaction);
		893	}
900	}	894	}
901		895
902	return notifications;	896	return notifications;
Lines 908-1077 Link Here
908	@Override	902	@Override
909	public NotificationChain inverseRemove(Object object, NotificationChain notifications)	903	public NotificationChain inverseRemove(Object object, NotificationChain notifications)
910	{	904	{
911	InternalEObject eObject = (InternalEObject)object;	905	if (FSMUtil.isTransient(CDOResourceImpl.this))
912	detached(eObject);	906	{
913	return eObject.eSetResource(null, notifications);	907	InternalEObject eObject = (InternalEObject)object;
914	}	908	notifications = eObject.eSetResource(null, notifications);
915	}	909	}
916		910	else
917	/**	911	{
918	* TODO Change superclass to NotifyingInternalEListImpl when EMF 2.3 is out of maintenance	912	InternalEObject eObject = (InternalEObject)object;
919	* <p>	913	detached(eObject);
920	* TODO Reuse {@link ResourceImpl.ContentsEList}!!! --> Bugzilla!	914	notifications = eObject.eSetResource(null, notifications);
921	*	915	}
922	* @ADDED
923	* @author Eike Stepper
924	*/
925	protected class TransientContents<E extends Object & EObject> extends NotifyingInternalEListImpl<E>
926	{
927	private static final long serialVersionUID = 1L;
928
929	public TransientContents()
930	{
931	}
932
933	public TransientContents(Collection<? extends E> collection)
934	{
935	super(collection);
936	}
937		916
938	public TransientContents(int initialCapacity)	917	return notifications;
939	{
940	super(initialCapacity);
941	}	918	}
942		919
943	/**	920	/**
944	* Optimization taken from ResourceImpl.EContentList.contains
945	*
946	* @since 2.0	921	* @since 2.0
947	*/	922	*/
948	@Override	923	protected void loaded()
949	public boolean contains(Object object)
950	{
951	return size <= 4 ? super.contains(object) : object instanceof InternalEObject
952	&& ((InternalEObject)object).eDirectResource() == CDOResourceImpl.this;
953	}
954
955	@Override
956	public Object getNotifier()
957	{
958	return CDOResourceImpl.this;
959	}
960
961	@Override
962	public int getFeatureID()
963	{	924	{
964	return EresourcePackage.CDO_RESOURCE__CONTENTS;	925	if (!isLoaded())
		926	{
		927	Notification notification = setLoaded(true);
		928	if (notification != null)
		929	{
		930	eNotify(notification);
		931	}
		932	}
965	}	933	}
966		934
967	@Override	935	/**
968	protected boolean isNotificationRequired()	936	* @since 2.0
		937	*/
		938	protected void modified()
969	{	939	{
970	return eNotificationRequired();	940	if (isTrackingModification())
		941	{
		942	setModified(true);
		943	}
971	}	944	}
972		945
		946	/**
		947	* @since 2.0
		948	*/
973	@Override	949	@Override
974	protected boolean useEquals()	950	protected boolean useEquals()
975	{	951	{
976	return false;	952	return false;
977	}	953	}
978		954
979	@Override
980	protected boolean hasInverse()
981	{
982	return true;
983	}
984
985	@Override
986	protected boolean isUnique()
987	{
988	return true;
989	}
990
991	/**	955	/**
992	* @since 2.0	956	* @since 2.0
993	*/	957	*/
994	/*
995	* IMPORTANT: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
996	* EMF with fixed bug #247130. These compile errors do not affect native models!
997	*/
998	public InternalEList<E> readWriteFiringList()
999	{
1000	return this;
1001	}
1002
1003	@Override
1004	public NotificationChain inverseAdd(E object, NotificationChain notifications)
1005	{
1006	InternalEObject eObject = (InternalEObject)object;
1007	notifications = eObject.eSetResource(CDOResourceImpl.this, notifications);
1008	// CDOResourceImpl.this.attached(eObject);
1009	return notifications;
1010	}
1011
1012	@Override
1013	public NotificationChain inverseRemove(E object, NotificationChain notifications)
1014	{
1015	InternalEObject eObject = (InternalEObject)object;
1016	// CDOResourceImpl.this.detached(eObject);
1017	return eObject.eSetResource(null, notifications);
1018	}
1019
1020	@Override
1021	protected void didAdd(int index, E object)
1022	{
1023	super.didAdd(index, object);
1024	modified();
1025	}
1026
1027	@Override	958	@Override
1028	protected void didRemove(int index, E object)	959	protected boolean hasInverse()
1029	{
1030	super.didRemove(index, object);
1031	modified();
1032	}
1033
1034	@Override
1035	protected void didSet(int index, E newObject, E oldObject)
1036	{
1037	super.didSet(index, newObject, oldObject);
1038	modified();
1039	}
1040
1041	@Override
1042	protected void didClear(int oldSize, Object[] oldData)
1043	{	960	{
1044	if (oldSize == 0)	961	return true;
1045	{
1046	loaded();
1047	}
1048	else
1049	{
1050	super.didClear(oldSize, oldData);
1051	}
1052	}	962	}
1053		963
1054	/**	964	/**
1055	* @since 2.0	965	* @since 2.0
1056	*/	966	*/
1057	protected void loaded()	967	@Override
1058	{	968	protected boolean isUnique()
1059	if (!isLoaded())
1060	{
1061	Notification notification = setLoaded(true);
1062	if (notification != null)
1063	{
1064	eNotify(notification);
1065	}
1066	}
1067	}
1068
1069	protected void modified()
1070	{	969	{
1071	if (isTrackingModification())	970	return true;
1072	{
1073	setModified(true);
1074	}
1075	}	971	}
1076	}	972	}
1077	} // CDOResourceImpl	973	} // CDOResourceImpl

Lines 165-196 Link Here

(-)src/org/eclipse/emf/cdo/CDOView.java (-26 lines)
165	public boolean hasConflict();	165	public boolean hasConflict();
166		166
167	/**	167	/**
168	* @see #setUniqueResourceContents(boolean)
169	* @deprecated This performance tweak is not necessary with EMF 2.5 anymore and is likely to be removed when CDO
170	* reaches 2.0. In the meantime it can be safely used.
171	*/
172	@Deprecated
173	public boolean hasUniqueResourceContents();
174
175	/**
176	* Specifies whether the contents list of resources will be unique or not.
177	* <p>
178	* This property is transient in that it does not stick with resources outside of the scope of this view. Especially
179	* it will not be persisted with resources in the repository. Each new view will start with <code>true</code> as a
180	* default value. Changing to <code>false</code> will subsequently apply to all resources being loaded or created.
181	* <p>
182	* Notice that the resource contents is a containment list and as such <b>must be</b> unique. Setting this property to
183	* <code>false</code> is only recommended for performance optimization when uniqueness is granted by other means.
184	* Violating the uniqueness constraint will result in unpredictable behaviour and possible corruption of the
185	* repository!
186	*
187	* @deprecated This performance tweak is not necessary with EMF 2.5 anymore and is likely to be removed when CDO
188	* reaches 2.0. In the meantime it can be safely used.
189	*/
190	@Deprecated
191	public void setUniqueResourceContents(boolean uniqueResourceContents);
192
193	/**
194	* Returns <code>true</code> if the {@link CDOObject objects} in this view will notify their	168	* Returns <code>true</code> if the {@link CDOObject objects} in this view will notify their
195	* {@link org.eclipse.emf.common.notify.Adapter adapters} about the fact that they are <em>invalidated</em> (due to	169	* {@link org.eclipse.emf.common.notify.Adapter adapters} about the fact that they are <em>invalidated</em> (due to
196	* remote changes), <code>false</code> otherwise.	170	* remote changes), <code>false</code> otherwise.

Lines 100-107 Link Here

(-)src/org/eclipse/emf/internal/cdo/CDOViewImpl.java (-14 lines)
100		100
101	private CDOURIHandler uriHandler = new CDOURIHandler(this);	101	private CDOURIHandler uriHandler = new CDOURIHandler(this);
102		102
103	private boolean uniqueResourceContents = true;
104
105	private boolean invalidationNotificationEnabled;	103	private boolean invalidationNotificationEnabled;
106		104
107	private CDORevisionPrefetchingPolicy revisionPrefetchingPolicy;	105	private CDORevisionPrefetchingPolicy revisionPrefetchingPolicy;
Lines 225-242 Link Here
225	return false;	223	return false;
226	}	224	}
227		225
228	@Deprecated
229	public boolean hasUniqueResourceContents()
230	{
231	return uniqueResourceContents;
232	}
233
234	@Deprecated
235	public void setUniqueResourceContents(boolean uniqueResourceContents)
236	{
237	this.uniqueResourceContents = uniqueResourceContents;
238	}
239
240	/**	226	/**
241	* @since 2.0	227	* @since 2.0
242	*/	228	*/

Lines 16-21 Link Here

(-)src/org/eclipse/emf/cdo/tests/AllTestsAllConfigs.java (-1 / +5 lines)
16	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246442_Test;	16	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246442_Test;
17	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246456_Test;	17	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246456_Test;
18	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246622_Test;	18	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246622_Test;
		19	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_248052_Test;
19	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_248124_Test;	20	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_248124_Test;
20	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_248915_Test;	21	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_248915_Test;
21	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_250036_Test;	22	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_250036_Test;
Lines 23-28 Link Here
23	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_250910_Test;	24	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_250910_Test;
24	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251087_Test;	25	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251087_Test;
25	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251263_Test;	26	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251263_Test;
		27	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251544_Test;
26	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251752_Test;	28	import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251752_Test;
27	import org.eclipse.emf.cdo.tests.config.ConfigTest;	29	import org.eclipse.emf.cdo.tests.config.ConfigTest;
28	import org.eclipse.emf.cdo.tests.config.ConfigTestSuite;	30	import org.eclipse.emf.cdo.tests.config.ConfigTestSuite;
Lines 85-98 Link Here
85	testClasses.add(Bugzilla_246442_Test.class);	87	testClasses.add(Bugzilla_246442_Test.class);
86	testClasses.add(Bugzilla_246456_Test.class);	88	testClasses.add(Bugzilla_246456_Test.class);
87	testClasses.add(Bugzilla_246622_Test.class);	89	testClasses.add(Bugzilla_246622_Test.class);
		90	testClasses.add(Bugzilla_248052_Test.class);
88	testClasses.add(Bugzilla_248124_Test.class);	91	testClasses.add(Bugzilla_248124_Test.class);
89	testClasses.add(Bugzilla_248915_Test.class);	92	testClasses.add(Bugzilla_248915_Test.class);
90	testClasses.add(Bugzilla_250036_Test.class);	93	testClasses.add(Bugzilla_250036_Test.class);
91	testClasses.add(Bugzilla_250757_Test.class);	94	testClasses.add(Bugzilla_250757_Test.class);
		95	testClasses.add(Bugzilla_250910_Test.class);
92	testClasses.add(Bugzilla_251087_Test.class);	96	testClasses.add(Bugzilla_251087_Test.class);
93	testClasses.add(Bugzilla_251263_Test.class);	97	testClasses.add(Bugzilla_251263_Test.class);
		98	testClasses.add(Bugzilla_251544_Test.class);
94	testClasses.add(Bugzilla_251752_Test.class);	99	testClasses.add(Bugzilla_251752_Test.class);
95	testClasses.add(Bugzilla_250910_Test.class);
96		100
97	// TODO testClasses.add(NonCDOResourceTest.class);	101	// TODO testClasses.add(NonCDOResourceTest.class);
98	// TODO testClasses.add(GeneratedEcoreTest.class);	102	// TODO testClasses.add(GeneratedEcoreTest.class);

Lines 63-69 Link Here

(-)src/org/eclipse/emf/cdo/tests/TransactionTest.java (-2 / +1 lines)
63	}	63	}
64	}	64	}
65		65
66	@SuppressWarnings("deprecation")
67	public void testCreateManyTransactions() throws Exception	66	public void testCreateManyTransactions() throws Exception
68	{	67	{
69	msg("Opening session");	68	msg("Opening session");
Lines 79-86 Link Here
79	msg("Transaction " + i + " (" + lastDuration + ")");	78	msg("Transaction " + i + " (" + lastDuration + ")");
80	lastDuration = System.currentTimeMillis();	79	lastDuration = System.currentTimeMillis();
81	transaction = session.openTransaction();	80	transaction = session.openTransaction();
82	transaction.setUniqueResourceContents(false);
83	resource = transaction.getResource("/test2");	81	resource = transaction.getResource("/test2");
		82
84	Category category = getModel1Factory().createCategory();	83	Category category = getModel1Factory().createCategory();
85	resource.getContents().add(category);	84	resource.getContents().add(category);
86	transaction.commit();	85	transaction.commit();

Added Link Here

(-)src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251544_Test.java (+68 lines)
1	package org.eclipse.emf.cdo.tests.bugzilla;
2
3	import org.eclipse.emf.cdo.CDOSession;
4	import org.eclipse.emf.cdo.CDOTransaction;
5	import org.eclipse.emf.cdo.eresource.CDOResource;
6	import org.eclipse.emf.cdo.tests.AbstractCDOTest;
7	import org.eclipse.emf.cdo.tests.model1.Order;
8	import org.eclipse.emf.cdo.tests.model1.OrderDetail;
9	import org.eclipse.emf.cdo.tests.model1.Product1;
10
11	import org.eclipse.emf.common.util.EList;
12	import org.eclipse.emf.ecore.EObject;
13
14	/**
15	* Resources fetched using CDOViewImpl.getResource(CDOID) not added to ResourceSet
16	* <p>
17	* See https://bugs.eclipse.org/251544
18	*
19	* @author Simon McDuff
20	*/
21	public class Bugzilla_251544_Test extends AbstractCDOTest
22	{
23	public void testFromPersistedToTransient() throws Exception
24	{
25	CDOSession session = openModel1Session();
26	CDOTransaction transaction = session.openTransaction();
27	CDOResource resource = transaction.createResource("/my/resource");
28
29	Order order1 = getModel1Factory().createOrder();
30	OrderDetail orderDetail = getModel1Factory().createOrderDetail();
31	Product1 product = getModel1Factory().createProduct1();
32	EList<EObject> contentList = resource.getContents();
33	resource.getContents().add(order1);
34	order1.getOrderDetails().add(orderDetail);
35	orderDetail.setProduct(product);
36
37	EList<OrderDetail> list = order1.getOrderDetails();
38	//
39	resource.getContents().remove(0); // remove object by index
40	list.remove(orderDetail);
41	transaction.commit();
42
43	resource.delete(null);
44
45	assertSame(contentList, resource.getContents());
46	}
47
48	public void testFromTransientToPersisted() throws Exception
49	{
50	CDOSession session = openModel1Session();
51	CDOTransaction transaction = session.openTransaction();
52	CDOResource resource = transaction.createResource("/my/resource");
53
54	Order order1 = getModel1Factory().createOrder();
55	OrderDetail orderDetail = getModel1Factory().createOrderDetail();
56	EList<OrderDetail> orderDetails = order1.getOrderDetails();
57	order1.getOrderDetails().add(orderDetail);
58
59	msg("Persist the graph");
60	resource.getContents().add(order1);
61	assertSame(orderDetails, order1.getOrderDetails());
62	resource.getContents().remove(0); // remove object by index
63	assertSame(orderDetails, order1.getOrderDetails());
64	assertEquals(true, orderDetails.remove(orderDetail));
65	transaction.commit();
66	}
67
68	}