summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-25 14:57:31 (EDT)
committerEike Stepper2007-07-25 14:57:31 (EDT)
commita6048b324ba34bf09a60afa7c04c54b9aafaf2d8 (patch)
treeb0ffd22a5c034672fd817f95d87b83de095d8a54
parent8b91222a90e68e0b296cc6b39a6652cf058bb3b0 (diff)
downloadcdo-a6048b324ba34bf09a60afa7c04c54b9aafaf2d8.zip
cdo-a6048b324ba34bf09a60afa7c04c54b9aafaf2d8.tar.gz
cdo-a6048b324ba34bf09a60afa7c04c54b9aafaf2d8.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java8
2 files changed, 6 insertions, 3 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 301934f..579d1b4 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
@@ -379,7 +379,6 @@ public class CDOAdapterImpl extends AdapterImpl implements InternalCDOObject
CDOID resourceID = revision.getResourceID();
Resource.Internal resource = (Resource.Internal)view.lookupInstance(resourceID);
transferResourceToTarget((BasicEObjectImpl)target, resource);
- // ((BasicEObjectImpl)target).eSetResource(resource, null);
}
else
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java
index 38cafa8..b6890a0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java
@@ -1,5 +1,6 @@
package org.eclipse.emf.internal.cdo.util;
+import org.eclipse.emf.cdo.CDOState;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
import org.eclipse.emf.cdo.protocol.CDOID;
@@ -11,7 +12,6 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
import org.eclipse.emf.internal.cdo.CDOAdapterImpl;
import org.eclipse.emf.internal.cdo.CDOViewImpl;
import org.eclipse.emf.internal.cdo.InternalCDOObject;
@@ -51,7 +51,11 @@ final class ProxyResolverResource implements Resource
if (object instanceof CDOAdapterImpl)
{
CDOAdapterImpl adapter = (CDOAdapterImpl)object;
- adapter.cdoInternalPostLoad();
+ if (adapter.cdoState() == CDOState.PROXY)
+ {
+ adapter.cdoInternalPostLoad();
+ }
+
return adapter.getTarget();
}