From 86a39fa29f439f149f7fb20f110c87628df8ec2e Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Wed, 1 Aug 2018 15:44:47 +0200 Subject: [PATCH] Revert "Fix AAIOOBE in GeoTestUtil." This reverts commit c3e813188eaf103ac8b6460cda3ce231db08b623. --- .../src/java/org/apache/lucene/geo/GeoTestUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java index bb29b0b0a31..8817d20e211 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java @@ -245,7 +245,7 @@ public class GeoTestUtil { return new double[] { nextLatitudeBetween(polygon.minLat, polygon.maxLat), nextLongitudeBetween(polygon.minLon, polygon.maxLon) }; } else if (surpriseMe < 20) { // target a vertex - int vertex = randomInt(polyLats.length - 2); + int vertex = randomInt(polyLats.length - 1); return new double[] { nextLatitudeNear(polyLats[vertex], polyLats[vertex+1] - polyLats[vertex]), nextLongitudeNear(polyLons[vertex], polyLons[vertex+1] - polyLons[vertex]) }; } else if (surpriseMe < 30) { @@ -253,12 +253,12 @@ public class GeoTestUtil { Polygon container = boxPolygon(new Rectangle(polygon.minLat, polygon.maxLat, polygon.minLon, polygon.maxLon)); double containerLats[] = container.getPolyLats(); double containerLons[] = container.getPolyLons(); - int startVertex = randomInt(containerLats.length - 2); + int startVertex = randomInt(containerLats.length - 1); return nextPointAroundLine(containerLats[startVertex], containerLons[startVertex], containerLats[startVertex+1], containerLons[startVertex+1]); } else { // target points around diagonals between vertices - int startVertex = randomInt(polyLats.length - 2); + int startVertex = randomInt(polyLats.length - 1); // but favor edges heavily int endVertex = randomBoolean() ? startVertex + 1 : randomInt(polyLats.length - 1); return nextPointAroundLine(polyLats[startVertex], polyLons[startVertex],