Skip to content

Commit ccec39f

Browse files
committed
Fix NPE in InternalGeoCentroidTests#testReduceRandom (#29481)
In some rare cases all inputs might have zero count and resulting in zero totalCount, and null in centroid causing NPE. Closes #29480
1 parent 684f3d8 commit ccec39f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

server/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ protected void assertReduced(InternalGeoCentroid reduced, List<InternalGeoCentro
6868
}
6969
totalCount += input.count();
7070
}
71-
assertEquals(latSum/totalCount, reduced.centroid().getLat(), 1E-5D);
72-
assertEquals(lonSum/totalCount, reduced.centroid().getLon(), 1E-5D);
71+
if (totalCount > 0) {
72+
assertEquals(latSum/totalCount, reduced.centroid().getLat(), 1E-5D);
73+
assertEquals(lonSum/totalCount, reduced.centroid().getLon(), 1E-5D);
74+
}
7375
assertEquals(totalCount, reduced.count());
7476
}
7577

0 commit comments

Comments
 (0)