[383602] Branch with base after the last finished commit can be created

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

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
index aec0598956..7c51efcc4b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
@@ -368,11 +368,11 @@ public class Repository extends Container<Object> implements InternalRepository
       throw new IllegalStateException("Branching is not supported by " + this);
     }
 
-    long lastFinishedTimeStamp = timeStampAuthority.getLastFinishedTimeStamp();
+    long timeStamp = getTimeStamp();
     long baseTimeStamp = branchInfo.getBaseTimeStamp();
-    if (baseTimeStamp == CDOBranchPoint.UNSPECIFIED_DATE || baseTimeStamp > lastFinishedTimeStamp)
+    if (baseTimeStamp == CDOBranchPoint.UNSPECIFIED_DATE || baseTimeStamp > timeStamp)
     {
-      baseTimeStamp = lastFinishedTimeStamp;
+      baseTimeStamp = timeStamp;
       branchInfo = new BranchInfo(branchInfo.getName(), branchInfo.getBaseBranchID(), baseTimeStamp);
     }