1 files changed, 10 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
index 2ae1095c08..723d942a1f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
@@ -242,15 +242,15 @@ public class CDOAdapterImpl extends AdapterImpl implements InternalCDOObject
     this.resource = (CDOResourceImpl)resource;
   }
 
-  public void cdoInternalFinalizeRevision()
+  public void cdoInternalPostLoad()
   {
-    transferTargetToRevision();
+    transferRevisionToTarget();
+    cdoInternalSetState(CDOState.CLEAN);
   }
 
-  public void cdoInternalResolveRevision()
+  public void cdoInternalPostAttach()
   {
-    transferRevisionToTarget();
-    cdoInternalSetState(CDOState.CLEAN);
+    // Do nothing
   }
 
   public InternalEObject cdoInternalInstance()
@@ -258,6 +258,11 @@ public class CDOAdapterImpl extends AdapterImpl implements InternalCDOObject
     return getTarget();
   }
 
+  public void cdoInternalPreCommit()
+  {
+    transferTargetToRevision();
+  }
+
   public EStructuralFeature cdoInternalDynamicFeature(int dynamicFeatureID)
   {
     // TODO Implement method CDOAdapterImpl.cdoInternalDynamicFeature()