Changeset 16552 in josm

Timestamp:

2020-06-07T14:45:04+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19240: NPE in MultipolygonCache.clear

• synchronize initializeInternalData()
• avoid to call MultipolygonCache.clear() with null

File:

• trunk/src/org/openstreetmap/josm/tools/Territories.java (modified) (2 diffs)

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

@@ -128 +128 @@
      * Initializes territories using the internal data only.
      */
-    public static void initializeInternalData() {
+    public static synchronized void initializeInternalData() {
         iso3166Cache = new HashMap<>();
         taginfoCache = new TreeMap<>();
@@ -167 +167 @@
             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