fix based on discussion in dev tagup

Open-MBEE · May 21, 2024 · fbfb634 · fbfb634
1 parent 28fbf1d
commit fbfb634
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/rdb/src/main/java/org/openmbee/mms/rdb/repositories/commit/CommitDAOImpl.java b/rdb/src/main/java/org/openmbee/mms/rdb/repositories/commit/CommitDAOImpl.java
@@ -154,10 +154,11 @@ public List<Commit> findByRefAndTimestampAndLimit(Branch ref, Instant timestamp,
             List<Commit> next = findByRefAndLimit(currentRef, currentCid, timestamp, currentLimit);
             commits.addAll(next);
 
+            String oldRef = currentRef;
             currentRef = ref.getParentRefId();
             currentCid = ref.getParentCommit();
 
-            if (currentRef == null || currentRef.equals(Constants.MASTER_BRANCH)) {
+            if (currentRef == null || (currentRef.equals(Constants.MASTER_BRANCH) && oldRef.equals(Constants.MASTER_BRANCH))) {
                 break;
             }
             Optional<Branch> parent = branchRepository.findByBranchId(currentRef);