summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-03 13:37:19 (EDT)
committerEike Stepper2007-08-03 13:37:19 (EDT)
commitf9ed2aa56f2c845c835278ae0a69588206c44b43 (patch)
treea28e4358e2c6562b7e015bb5549eaf69f36e20e8
parente02589552a1eb18f485fe4e51f79fb12af02f9f6 (diff)
downloadcdo-f9ed2aa56f2c845c835278ae0a69588206c44b43.zip
cdo-f9ed2aa56f2c845c835278ae0a69588206c44b43.tar.gz
cdo-f9ed2aa56f2c845c835278ae0a69588206c44b43.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java6
1 files changed, 3 insertions, 3 deletions
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 e12f2c0..ecfbb4a 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
@@ -217,7 +217,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
public InternalCDOObject getObject(CDOID id)
{
// TODO Really load on demand here?
- return getObject(id, true);
+ return getObject(id, false);
}
public InternalCDOObject getObject(CDOID id, boolean loadOnDemand)
@@ -297,7 +297,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
object.cdoInternalSetView(this);
object.cdoInternalSetRevision(revision);
object.cdoInternalSetID(revision.getID());
- object.cdoInternalSetState(CDOState.PROXY); // FIXME
+ object.cdoInternalSetState(CDOState.CLEAN);
return object;
}
@@ -403,7 +403,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
}
CDOID id = (CDOID)potentialID;
- InternalCDOObject result = getObject(id);
+ InternalCDOObject result = getObject(id, true);
if (result == null)
{
throw new ImplementationError("ID not registered: " + id);