[400892] Intern all CDOIDs

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

1 files changed, 13 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
index 8c4b34780e..a39247c3ec 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
@@ -204,6 +204,7 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
           public boolean handleRevision(CDORevision revision)
           {
             InternalCDORevision rev = (InternalCDORevision)revision;
+            adjustRevisionBranch(rev);
             accessor.rawStore(rev, monitor);
 
             long commitTime = revision.getTimeStamp();
@@ -617,6 +618,7 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
 
         accessor.rawDelete(id, localRevision.getVersion(), localBranch, eClass, new Monitor());
         localRevision.setVersion(remoteRevision.getVersion());
+        adjustRevisionBranch(localRevision);
         accessor.rawStore(localRevision, new Monitor());
       }
     }
@@ -630,6 +632,17 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
     }
   }
 
+  private void adjustRevisionBranch(InternalCDORevision revision)
+  {
+    InternalCDOBranchManager branchManager = localRepository.getBranchManager();
+    InternalCDOBranch branch = revision.getBranch();
+    if (branch.getBranchManager() != branchManager)
+    {
+      branch = branchManager.getBranch(branch.getID());
+      revision.setBranchPoint(branch.getPoint(revision.getTimeStamp()));
+    }
+  }
+
   /**
    * @deprecated Attaching new objects is only supported for IDGenerationLocation.CLIENT
    */