Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-10-25 14:44:17 -0400
committerEike Stepper2010-10-25 14:44:17 -0400
commit974f8f6d0c9785fda270a3ca6707a2cf3f63d817 (patch)
treee0965b1688995a4d23da36501a9a0a5e8b49b496 /plugins/org.eclipse.emf.cdo.workspace.efs
parentd32fa8230583fd70eb59b2c996af1e46c4a01311 (diff)
downloadcdo-974f8f6d0c9785fda270a3ca6707a2cf3f63d817.tar.gz
cdo-974f8f6d0c9785fda270a3ca6707a2cf3f63d817.tar.xz
cdo-974f8f6d0c9785fda270a3ca6707a2cf3f63d817.zip
[327405] Provide an offline CDOWorkspace with Checkout/Update/Commit workflows
https://bugs.eclipse.org/bugs/show_bug.cgi?id=327405
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.workspace.efs')
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java26
1 files changed, 14 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
index 20445218d3..b426195c93 100644
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
+++ b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
@@ -397,21 +397,23 @@ public final class CDOWorkspaceStore extends AbstractResourceNodeStore
else
{
// Single-valued cross reference
- CDOObject cdoValue;
-
- org.eclipse.emf.common.util.URI eProxyURI = ((InternalEObject)xmiValue).eProxyURI();
- if (eProxyURI != null)
+ CDOObject cdoValue = null;
+ if (xmiValue != null)
{
- String href = eProxyURI.fragment();
- cdoValue = getCDOObjectByHREF(href);
- if (cdoValue == null)
+ org.eclipse.emf.common.util.URI eProxyURI = ((InternalEObject)xmiValue).eProxyURI();
+ if (eProxyURI != null)
{
- registerForwardReference(cdoObject, reference, -1, href);
+ String href = eProxyURI.fragment();
+ cdoValue = getCDOObjectByHREF(href);
+ if (cdoValue == null)
+ {
+ registerForwardReference(cdoObject, reference, -1, href);
+ }
+ }
+ else
+ {
+ cdoValue = getCDOObjectByXMIID((EObject)xmiValue);
}
- }
- else
- {
- cdoValue = getCDOObjectByXMIID((EObject)xmiValue);
}
cdoObject.eSet(reference, cdoValue);

Back to the top