*** empty log message ***

3 files changed, 13 insertions, 7 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 f0566ef6a7..67641430a7 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
@@ -39,6 +39,7 @@ public class CDOCallbackImpl extends CDOLegacyImpl implements CDOCallback
   @Override
   protected Object convertPotentialID(CDOViewImpl view, Object id)
   {
-    return view.getObject((CDOID)id, false);
+    InternalCDOObject object = view.getObject((CDOID)id, false);
+    return object.cdoInternalInstance();
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
index 172fa747bc..b66d0ead32 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
@@ -155,7 +155,7 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
   public void cdoInternalPostLoad()
   {
     transferRevisionToInstance();
-    cdoInternalSetState(CDOState.CLEAN);
+    // cdoInternalSetState(CDOState.CLEAN);
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index ecfbb4aa2e..1b6ca131cb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -258,6 +258,11 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
    */
   private InternalCDOObject createMetaObject(CDOID id)
   {
+    if (TRACER.isEnabled())
+    {
+      TRACER.trace("Creating meta object for " + id);
+    }
+
     InternalEObject metaInstance = session.lookupMetaInstance(id);
     if (metaInstance == null)
     {
@@ -272,12 +277,12 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
    */
   private InternalCDOObject createObject(CDOID id)
   {
-    CDORevisionImpl revision = getRevision(id);
     if (TRACER.isEnabled())
     {
-      TRACER.trace("Creating object for revision: " + revision);
+      TRACER.trace("Creating object for " + id);
     }
 
+    CDORevisionImpl revision = getRevision(id);
     CDOClassImpl cdoClass = revision.getCDOClass();
     InternalCDOObject object = newInstance(cdoClass);
     if (object instanceof CDOResourceImpl)
@@ -298,17 +303,18 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
     object.cdoInternalSetRevision(revision);
     object.cdoInternalSetID(revision.getID());
     object.cdoInternalSetState(CDOState.CLEAN);
+    object.cdoInternalPostLoad();
     return object;
   }
 
   private InternalCDOObject createProxy(CDOID id)
   {
-    CDOClassImpl cdoClass = getObjectType(id);
     if (TRACER.isEnabled())
     {
-      TRACER.format("Creating proxy for {0}: {1}" + id, cdoClass);
+      TRACER.format("Creating proxy for " + id);
     }
 
+    CDOClassImpl cdoClass = getObjectType(id);
     InternalCDOObject object = newInstance(cdoClass);
     if (object instanceof CDOResourceImpl)
     {
@@ -318,7 +324,6 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
     object.cdoInternalSetView(this);
     object.cdoInternalSetID(id);
     object.cdoInternalSetState(CDOState.PROXY);
-
     return object;
   }