summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-23 15:11:10 (EDT)
committerEike Stepper2007-07-23 15:11:10 (EDT)
commitb4ee88cd7d8487cdec6a91ba5a88d6068012486b (patch)
treec05c5b3550b7de38007b70b92b117324331b3739
parent1dc74681bfd44218644efb7a66efc802bf5f93c5 (diff)
downloadcdo-b4ee88cd7d8487cdec6a91ba5a88d6068012486b.zip
cdo-b4ee88cd7d8487cdec6a91ba5a88d6068012486b.tar.gz
cdo-b4ee88cd7d8487cdec6a91ba5a88d6068012486b.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java15
2 files changed, 3 insertions, 17 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index cd16954..aba0ac9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -430,12 +430,13 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
@Override
public CDOState cdoState()
{
- if (isExisting() && super.cdoState() == CDOState.TRANSIENT)
+ CDOState superState = super.cdoState();
+ if (superState == CDOState.TRANSIENT && isExisting())
{
return CDOState.PROXY;
}
- return super.cdoState();
+ return superState;
}
/**
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 05971ed..0b4d6fa 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
@@ -232,21 +232,6 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
private InternalCDOObject createObjectForRevision(CDOID id)
{
- // if (id.isMeta())
- // {
- // if (TRACER.isEnabled())
- // {
- // TRACER.format("Creating meta: ID={0}", id);
- // }
- //
- // InternalEObject metaInstance = session.lookupMetaInstance(id);
- // if (metaInstance == null)
- // {
- // throw new IllegalArgumentException("No meta instance for " + id);
- // }
- //
- // }
-
if (TRACER.isEnabled())
{
TRACER.format("Creating object: ID={0}", id);