Skip to content

Commit d40aa07

Browse files
committed
Rename version conflict local variables
This commit renames the local variable used to store the result of checking whether or not there is a version conflict.
1 parent bbffd87 commit d40aa07

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ private IndexResult innerIndex(Index index) throws IOException {
674674
}
675675
}
676676
final long expectedVersion = index.version();
677-
final Optional<IndexResult> checkVersionConflictResult =
677+
final Optional<IndexResult> resultOnVersionConflict =
678678
checkVersionConflict(
679679
index,
680680
currentVersion,
@@ -684,8 +684,8 @@ private IndexResult innerIndex(Index index) throws IOException {
684684
e -> new IndexResult(e, currentVersion, index.seqNo()));
685685

686686
final IndexResult indexResult;
687-
if (checkVersionConflictResult.isPresent()) {
688-
indexResult = checkVersionConflictResult.get();
687+
if (resultOnVersionConflict.isPresent()) {
688+
indexResult = resultOnVersionConflict.get();
689689
} else {
690690
// no version conflict
691691
if (index.origin() == Operation.Origin.PRIMARY) {
@@ -808,7 +808,7 @@ private DeleteResult innerDelete(Delete delete) throws IOException {
808808

809809
final long expectedVersion = delete.version();
810810

811-
final Optional<DeleteResult> checkVersionConflictResult =
811+
final Optional<DeleteResult> resultOnVersionConflict =
812812
checkVersionConflict(
813813
delete,
814814
currentVersion,
@@ -817,8 +817,8 @@ private DeleteResult innerDelete(Delete delete) throws IOException {
817817
() -> new DeleteResult(expectedVersion, delete.seqNo(), true),
818818
e -> new DeleteResult(e, expectedVersion, delete.seqNo()));
819819
final DeleteResult deleteResult;
820-
if (checkVersionConflictResult.isPresent()) {
821-
deleteResult = checkVersionConflictResult.get();
820+
if (resultOnVersionConflict.isPresent()) {
821+
deleteResult = resultOnVersionConflict.get();
822822
} else {
823823
if (delete.origin() == Operation.Origin.PRIMARY) {
824824
seqNo = seqNoService().generateSeqNo();

0 commit comments

Comments
 (0)