[Java] Minor simplification of catch up logic.

LeeCampbell · Mar 31, 2018 · b5df18a · b5df18a
1 parent fc3a73e
commit b5df18a
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/SequencerAgent.java b/aeron-cluster/src/main/java/io/aeron/cluster/SequencerAgent.java
@@ -1166,15 +1166,14 @@ private void awaitCatchUp()
             final RecordingLog.ReplayStep lastStep = recoveryPlan.termSteps.get(lastStepIndex);
             final RecordingLog.Entry entry = lastStep.entry;
 
-            // TODO: fix up recordingLog entry for last step for on disk in case we recover again
-
             termBaseLogPosition = entry.termBaseLogPosition;
             leadershipTermId = entry.leadershipTermId;
 
             final int logSessionId = lastStepIndex + 1;
             channelUri.put(CommonContext.SESSION_ID_PARAM_NAME, Integer.toString(logSessionId));
             final String channel = channelUri.toString();
             final long recordingId = recordingCatchUp.recordingIdToExtend();
+            recordingCatchUp = null;
 
             try (Counter counter = CommitPos.allocate(aeron, tempBuffer, leadershipTermId, termBaseLogPosition, length))
             {
@@ -1198,17 +1197,11 @@ private void awaitCatchUp()
                         replayTerm(image, stopPosition, counter);
 
                         final long termPosition = image.position();
-                        if (lastStep.entry.termPosition < termPosition)
-                        {
-                            recordingLog.commitLeadershipTermPosition(leadershipTermId, termPosition);
-                        }
-
+                        recordingLog.commitLeadershipTermPosition(leadershipTermId, termPosition);
                         termBaseLogPosition = entry.termBaseLogPosition + termPosition;
                     }
                 }
             }
-
-            recordingCatchUp = null;
         }
     }