[270716] Provide support for branching

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

2 files changed, 8 insertions, 12 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java
index 210656891a..20030fa8a1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java
@@ -380,20 +380,23 @@ public abstract class RevisionInfo
     {
       private CDOBranchVersion targetBranchVersion;
 
+      private boolean hasTarget;
+
       public Pointer(CDOID id, CDOBranchPoint requestedBranchPoint, CDOBranchVersion availableBranchVersion,
           CDOBranchVersion targetBranchVersion)
       {
         super(id, requestedBranchPoint, availableBranchVersion);
         this.targetBranchVersion = targetBranchVersion;
+        hasTarget = targetBranchVersion instanceof InternalCDORevision;
       }
 
       private Pointer(CDODataInput in, CDOBranchPoint requestedBranchPoint) throws IOException
       {
         super(in, requestedBranchPoint);
-        boolean hasTarget = in.readBoolean();
-        if (!hasTarget)
+        if (in.readBoolean())
         {
           targetBranchVersion = in.readCDOBranchVersion();
+          hasTarget = in.readBoolean();
         }
       }
 
@@ -410,7 +413,7 @@ public abstract class RevisionInfo
 
       public boolean hasTarget()
       {
-        return targetBranchVersion != null;
+        return hasTarget;
       }
 
       @Override
@@ -432,6 +435,7 @@ public abstract class RevisionInfo
         {
           out.writeBoolean(true);
           out.writeCDOBranchVersion(targetBranchVersion);
+          out.writeBoolean(hasTarget);
         }
         else
         {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerTest.java
index 2bbb9fd5d8..57a972e24e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerTest.java
@@ -277,16 +277,8 @@ public class RevisionManagerTest extends AbstractCDOTest
 
   private static void assertLoads(int expected)
   {
-    assertLoads(expected, true);
-  }
-
-  private static void assertLoads(int expected, boolean reset)
-  {
     assertEquals(expected, loadCounter.get());
-    if (reset)
-    {
-      loadCounter.set(0);
-    }
+    loadCounter.set(0);
   }
 
   public void testBranch0_Initial() throws Exception