Apache Solr open-source search software
SOLR-18006 Fix precommit (#3927)
Jan Høydahlae8ba6973411
diff --git a/dev-tools/scripts/cherrypick.sh b/dev-tools/scripts/cherrypick.shindex bdf25c150bd..692c2cc12f6 100755--- a/dev-tools/scripts/cherrypick.sh+++ b/dev-tools/scripts/cherrypick.sh@@ -181,7 +181,7 @@ for BRANCH in "${BRANCHES[@]}"; doif [[ "$PRECOMMIT" ]] || [[ "$TEST" ]]; thenLOG "INFO" "Testing the cherry-pick on $BRANCH by running 'gradlew check ${TESTARG}'"# shellcheck disable=SC2086- ./gradlew check -q $TESTARG+ ./gradlew check -q $TESTARG -Pvalidation.errorprone=trueif [ $? -gt 0 ]; thenLOG "WARN" "Tests failed. Please fix and push manually"exit 2diff --git a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.javaindex 796e6cedca3..238666d7165 100644--- a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java+++ b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java@@ -336,7 +336,7 @@ public class LatLonPointSpatialField@Overridepublic FieldComparator<?> newComparator(- String fieldname,+ String fieldName,int numHits,Pruning pruning,boolean reversed) { // 'reversed' is an FYI. It's implemented by the caller chain.@@ -345,7 +345,7 @@ public class LatLonPointSpatialField@Overridepublic boolean equals(Object o) {- if (o == null || getClass() != o.getClass()) return false;+ if (!(o instanceof DistanceFieldComparatorSource)) return false;var that = (DistanceFieldComparatorSource) o;return Objects.equals(queryPoint, that.queryPoint);}