Changeset 15569 in josm for trunk/src/org

Timestamp:

2019-12-08T15:59:41+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18302 - fix NPE in unit tests

File:

• trunk/src/org/openstreetmap/josm/tools/Territories.java (modified) (1 diff)

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

@@ -147 +147 @@
     public static Map<String, String> getNationalTaginfoUrls(LatLon ll) {
         Map<String, String> result = new TreeMap<>();
-        for (String code : iso3166Cache.entrySet().parallelStream().distinct()
-            .filter(e -> Boolean.TRUE.equals(e.getValue().get(ll)))
-            .map(Entry<String, GeoPropertyIndex<Boolean>>::getKey)
-            .collect(Collectors.toSet())) {
-            String taginfo = taginfoCache.get(code);
-            if (taginfo != null) {
-                result.put(code, taginfo);
+        if (iso3166Cache != null) {
+            for (String code : iso3166Cache.entrySet().parallelStream().distinct()
+                .filter(e -> Boolean.TRUE.equals(e.getValue().get(ll)))
+                .map(Entry<String, GeoPropertyIndex<Boolean>>::getKey)
+                .collect(Collectors.toSet())) {
+                String taginfo = taginfoCache.get(code);
+                if (taginfo != null) {
+                    result.put(code, taginfo);
+                }
             }
         }