[209307] Optimize reload() to only verify current revisions

https://bugs.eclipse.org/bugs/show_bug.cgi?id=209307

1 files changed, 12 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index 2a70a554f8..bdb9ae25dc 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -158,9 +158,19 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   {
     Map<CDOID, InternalCDOObject> ids = new HashMap<CDOID, InternalCDOObject>();
     List<CDORevisionImpl> revisions = new ArrayList<CDORevisionImpl>();
+    List<CDORevisionImpl> revised = new ArrayList<CDORevisionImpl>();
     for (InternalCDOObject object : objects)
     {
-      revisions.add((CDORevisionImpl)object.cdoRevision());
+      CDORevisionImpl revision = (CDORevisionImpl)object.cdoRevision();
+      if (revision.isCurrent())
+      {
+        revisions.add(revision);
+      }
+      else
+      {
+        revised.add(revision);
+      }
+
       ids.put(object.cdoID(), object);
     }
 
@@ -176,6 +186,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
       throw new TransportException(ex);
     }
 
+    revisions.addAll(revised);
     for (CDORevisionImpl revision : revisions)
     {
       InternalCDOObject object = ids.get(revision.getID());