This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9_10
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_10 by this push:
new d9a3fcaa3d2 SOLR-18006 Fix precommit (#3927)
d9a3fcaa3d2 is described below
commit d9a3fcaa3d24c569c2fcd396793a45096c475a85
Author: Jan Høydahl <[email protected]>
AuthorDate: Fri Dec 5 21:39:29 2025 +0100
SOLR-18006 Fix precommit (#3927)
* Do errorprone checks in cherrypick script
(cherry picked from commit ae8ba6973411a534eaae1df2789f02238c271944)
---
dev-tools/scripts/cherrypick.sh | 2 +-
.../core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-tools/scripts/cherrypick.sh b/dev-tools/scripts/cherrypick.sh
index b3902ccd157..a1ad6ac6041 100755
--- a/dev-tools/scripts/cherrypick.sh
+++ b/dev-tools/scripts/cherrypick.sh
@@ -180,7 +180,7 @@ for BRANCH in "${BRANCHES[@]}"; do
if [[ "$PRECOMMIT" ]] || [[ "$TEST" ]]; then
LOG "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=true
if [ $? -gt 0 ]; then
LOG "WARN" "Tests failed. Please fix and push manually"
exit 2
diff --git
a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
index 7a6f013e87a..b21108b091a 100644
--- a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
+++ b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
@@ -344,7 +344,7 @@ public class LatLonPointSpatialField
@Override
public FieldComparator<?> newComparator(
- String fieldname,
+ String fieldName,
int numHits,
Pruning pruning,
boolean reversed) { // 'reversed' is an FYI. It's implemented by
the caller chain.
@@ -353,7 +353,7 @@ public class LatLonPointSpatialField
@Override
public 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);
}