Changeset 19671 in josm for trunk/src/org

Timestamp:

2026-11-01T20:49:00+01:00 (7 days ago)

Author:

gaben

Message:

fix #22878 - ConcurrentModificationException in MapCSSTagChecker when the rules are reloaded during validation

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -405 +405 @@
      */
     void visit(Collection<OsmPrimitive> selection, Predicate<String> urlPredicate) {
+        // the rules may be reloaded by another thread (preferences, file watcher) while the validation is running, see #22878
+        final List<Entry<String, Set<MapCSSTagCheckerRule>>> checksToRun;
+        synchronized (this) {
+            checksToRun = new ArrayList<>(checks.entrySet());
+        }
         if (urlPredicate == null && progressMonitor != null) {
-            progressMonitor.setTicksCount(selection.size() * checks.size());
+            progressMonitor.setTicksCount(selection.size() * checksToRun.size());
         }
 
@@ -414 +419 @@
 
         Set<OsmPrimitive> surrounding = new HashSet<>();
-        for (Entry<String, Set<MapCSSTagCheckerRule>> entry : checks.entrySet()) {
+        for (Entry<String, Set<MapCSSTagCheckerRule>> entry : checksToRun) {
             if (isCanceled()) {
                 break;