Make index creation threadsafe (#572)

Signed-off-by: Martin Davis <[email protected]>
locationtech · Aug 6, 2020 · 29b00ec · 29b00ec
1 parent 06cd292
commit 29b00ec
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/...s/core/src/main/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocator.java b/...s/core/src/main/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocator.java
@@ -79,11 +79,7 @@ public IndexedPointInAreaLocator(Geometry g)
    */
   public int locate(Coordinate p)
   {
-    if (index == null) {
-      index = new IntervalIndexedGeometry(geom);
-      // no need to hold onto geom
-      geom = null;
-    }
+    createIndex();
     RayCrossingCounter rcc = new RayCrossingCounter(p);
 
     SegmentVisitor visitor = new SegmentVisitor(rcc);
@@ -97,6 +93,17 @@ public int locate(Coordinate p)
 
     return rcc.getLocation();
   }
+
+  /**
+   * Creates the indexed geometry, creating it if necessary.
+   */
+  private synchronized void createIndex() {
+    if (index == null) {
+      index = new IntervalIndexedGeometry(geom);
+      // no need to hold onto geom
+      geom = null;
+    }
+  }
 
   private static class SegmentVisitor
     implements ItemVisitor