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/CDOViewImpl.java')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java26
1 files changed, 19 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index ad78f2bfa6..5f4d77d889 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -14,6 +14,7 @@ package org.eclipse.emf.internal.cdo.view;
import org.eclipse.emf.cdo.CDONotification;
import org.eclipse.emf.cdo.CDOObject;
+import org.eclipse.emf.cdo.CDOState;
import org.eclipse.emf.cdo.common.branch.CDOBranch;
import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
import org.eclipse.emf.cdo.common.id.CDOID;
@@ -259,14 +260,9 @@ public class CDOViewImpl extends AbstractCDOView
List<InternalCDORevision> revisions = new LinkedList<InternalCDORevision>();
for (CDOObject object : objects)
{
- if (!FSMUtil.isNew(object))
+ InternalCDORevision revision = getRevision(object);
+ if (revision != null)
{
- InternalCDORevision revision = (InternalCDORevision)object.cdoRevision();
- if (revision == null)
- {
- revision = CDOStateMachine.INSTANCE.read((InternalCDOObject)object);
- }
-
revisions.add(revision);
}
}
@@ -303,6 +299,22 @@ public class CDOViewImpl extends AbstractCDOView
}
}
+ protected InternalCDORevision getRevision(CDOObject object)
+ {
+ if (object.cdoState() == CDOState.NEW)
+ {
+ return null;
+ }
+
+ InternalCDORevision revision = (InternalCDORevision)object.cdoRevision();
+ if (revision == null)
+ {
+ revision = CDOStateMachine.INSTANCE.read((InternalCDOObject)object);
+ }
+
+ return revision;
+ }
+
/**
* @since 2.0
*/

Back to the top