From 90d3ed95ab65b62e8933fe7838d4c29d77ba2c81 Mon Sep 17 00:00:00 2001
From: Taylor Smock <tsmock@fb.com>
Date: Thu, 3 Jun 2021 10:40:45 -0600
Subject: [PATCH] ImageDetection: Use synchronized list to avoid a CME

This fixes JOSM #20961.

Signed-off-by: Taylor Smock <tsmock@fb.com>
---
 .../mapillary/model/ImageDetection.java       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapillary/model/ImageDetection.java b/src/main/java/org/openstreetmap/josm/plugins/mapillary/model/ImageDetection.java
index 80d61130f..ea2cf6326 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapillary/model/ImageDetection.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapillary/model/ImageDetection.java
@@ -55,7 +55,8 @@ public class ImageDetection<T extends Shape & Serializable> extends SpecialImage
     .getCache(CACHE_NAME_PREFIX + "instances");
   private static final String PACKAGE_TRAFFIC_SIGNS = "trafficsign";
 
-  private static final List<CacheAccess<String, List<ImageDetection<?>>>> searchDetections = new ArrayList<>(3);
+  private static final List<CacheAccess<String, List<ImageDetection<?>>>> searchDetections = Collections
+    .synchronizedList(new ArrayList<>(3));
 
   private static void setSearchDetections() {
     // segmentations take awhile to get (10+ seconds on my machine), so default off
@@ -118,17 +119,19 @@ public static void getDetections(String key, BiConsumer<String, List<ImageDetect
    */
   public static List<ImageDetection<?>> getDetections(String key, boolean wait) {
     List<ImageDetection<?>> detections = new ArrayList<>();
-    for (CacheAccess<String, List<ImageDetection<?>>> cache : searchDetections) {
-      final List<ImageDetection<?>> layerDetections;
-      if (wait) {
-        layerDetections = cache.get(key,
-          () -> getDetections(key, cache.getCacheAttributes().getCacheName().replaceFirst(CACHE_NAME_PREFIX, "")));
-      } else if (key != null && cache.get(key) != null) {
-        layerDetections = cache.get(key);
-      } else {
-        layerDetections = Collections.emptyList();
+    synchronized (searchDetections) {
+      for (CacheAccess<String, List<ImageDetection<?>>> cache : searchDetections) {
+        final List<ImageDetection<?>> layerDetections;
+        if (wait) {
+          layerDetections = cache.get(key,
+            () -> getDetections(key, cache.getCacheAttributes().getCacheName().replaceFirst(CACHE_NAME_PREFIX, "")));
+        } else if (key != null && cache.get(key) != null) {
+          layerDetections = cache.get(key);
+        } else {
+          layerDetections = Collections.emptyList();
+        }
+        detections.addAll(layerDetections);
       }
-      detections.addAll(layerDetections);
     }
     return detections.isEmpty() ? Collections.emptyList() : detections;
   }