Ticket #19240: 19240.patch

src/org/openstreetmap/josm/tools/Territories.java

@@ -127 +127 @@
     /**
      * Initializes territories using the internal data only.
      */
-    public static void initializeInternalData() {
+    public static synchronized void initializeInternalData() {
         iso3166Cache = new HashMap<>();
         taginfoCache = new TreeMap<>();
         customTagsCache = new TreeMap<>();
@@ -166 +166 @@
         } catch (IOException | IllegalDataException ex) {
             throw new JosmRuntimeException(ex);
         } finally {
-            MultipolygonCache.getInstance().clear(dataSet);
+            if (dataSet != null)
+                MultipolygonCache.getInstance().clear(dataSet);
             if (!Logging.isDebugEnabled()) {
                 // unset dataSet to save memory, see #18907
                 dataSet = null;