Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index 9ea71ea385..d313484ff2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -1207,14 +1207,11 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
InternalCDOObject object = (InternalCDOObject)idOrObject;
if (object.cdoView() != null && FSMUtil.isNew(object))
{
- String uri = EcoreUtil.getURI(eObject).toString();
+ String uri = EcoreUtil.getURI(object.cdoInternalInstance()).toString();
if (object.cdoID().isTemporary())
{
return CDOIDUtil.createTempObjectExternal(uri);
}
-
- // New objects with non-temporary IDs are possible. Likely UUIDs
- return CDOIDUtil.createExternal(uri);
}
}
@@ -1224,7 +1221,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
// Check if eObject is contained by a deleted resource
if (!(eResource instanceof CDOResource) || ((CDOResource)eResource).cdoState() != CDOState.TRANSIENT)
{
- String uri = EcoreUtil.getURI(eObject).toString();
+ String uri = EcoreUtil.getURI(CDOUtil.getEObject(eObject)).toString();
return CDOIDUtil.createExternal(uri);
}
}

Back to the top