Skip to content

Commit 1fdcba7

Browse files
committed
RATIS-2129. Single call of getLastTermIndex
1 parent 0919f63 commit 1fdcba7

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -614,10 +614,12 @@ long getLastIndexInClosedSegments() {
614614

615615
TermIndex getLastTermIndex() {
616616
try (AutoCloseableLock readLock = closedSegments.readLock()) {
617-
return (openSegment != null && openSegment.getLastTermIndex() != null) ?
618-
openSegment.getLastTermIndex() :
619-
(closedSegments.isEmpty() ? null :
620-
closedSegments.get(closedSegments.size() - 1).getLastTermIndex());
617+
TermIndex lastOpenIndex =
618+
(openSegment != null) ? openSegment.getLastTermIndex() : null;
619+
return lastOpenIndex != null
620+
? lastOpenIndex
621+
: (closedSegments.isEmpty() ? null :
622+
closedSegments.get(closedSegments.size() - 1).getLastTermIndex());
621623
}
622624
}
623625

0 commit comments

Comments
 (0)