summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-08 07:29:52 (EDT)
committerEike Stepper2007-08-08 07:29:52 (EDT)
commitaef670d382c3f27a7630337d861beaf6715bd9c1 (patch)
tree4805bf40df0b294525b500368169cf1f2dcd8e0e
parent4d8706fbed5034715974877ce56a1d811e066bf8 (diff)
downloadcdo-aef670d382c3f27a7630337d861beaf6715bd9c1.zip
cdo-aef670d382c3f27a7630337d861beaf6715bd9c1.tar.gz
cdo-aef670d382c3f27a7630337d861beaf6715bd9c1.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java4
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java
index 6fdbca0..97fe1d4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java
@@ -50,7 +50,7 @@ public class CDOCallbackImpl extends CDOAdapterImpl implements CDOCallback
if (feature instanceof EReference)
{
EReference reference = (EReference)feature;
- if (reference.isContainment())
+ if (reference.isContainment() && !reference.isTransient())
{
switch (msg.getEventType())
{
@@ -101,7 +101,7 @@ public class CDOCallbackImpl extends CDOAdapterImpl implements CDOCallback
private void notifyAdd(InternalEObject instance)
{
- if (!instance.eDeliver())
+ if (instance.eDeliver())
{
InternalCDOObject object = FSMUtil.adapt(instance, view);
CDOStateMachine.INSTANCE.attach(object, cdoResource(), view);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
index f4dd397..104de5d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.cdo.CDOState;
import org.eclipse.emf.cdo.CDOView;
import org.eclipse.emf.cdo.protocol.CDOID;
-import org.eclipse.net4j.util.ImplementationError;
-
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EGenericType;
@@ -120,7 +118,7 @@ public final class FSMUtil
return adapter;
}
- throw new ImplementationError("Neither InternalCDOObject nor InternalEObject: " + object.getClass().getName());
+ return null;
}
public static Iterator<InternalCDOObject> iterator(Collection instances, final CDOViewImpl view)