diff options
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java | 7 |
1 files changed, 5 insertions, 2 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 97fe1d4cc4..e54d24f572 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 @@ -123,7 +123,10 @@ public class CDOCallbackImpl extends CDOAdapterImpl implements CDOCallback private void notifyRemove(InternalEObject instance) { - InternalCDOObject object = FSMUtil.adapt(instance, view); - CDOStateMachine.INSTANCE.detach(object, cdoResource(), view); + if (instance.eDeliver()) + { + InternalCDOObject object = FSMUtil.adapt(instance, view); + CDOStateMachine.INSTANCE.detach(object, cdoResource(), view); + } } } |