Changeset 15913 in josm for trunk/src

Timestamp:

2020-02-23T14:35:55+01:00 (4 years ago)

Author:

simon04

Message:

fix #18754, see #18729 - TaginfoRegionalInstance: fix deadlock

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• tools/Territories.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -372 +372 @@
         if (!newSel.isEmpty()) {
             final LatLon center = newSel.iterator().next().getBBox().getCenter();
-            Territories.getRegionalTaginfoUrls(center)
+            Territories.getRegionalTaginfoUrls(center).stream()
                     .map(taginfo -> new TaginfoAction(
                             tagTable, editHelper::getDataKey, editHelper::getDataValues,

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

@@ -10 +10 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -203 +204 @@
      * @since 15876
      */
-    public static Stream<TaginfoRegionalInstance> getRegionalTaginfoUrls(LatLon ll) {
+    public static List<TaginfoRegionalInstance> getRegionalTaginfoUrls(LatLon ll) {
         if (iso3166Cache == null) {
-            return Stream.empty();
+            return Collections.emptyList();
         }
         return iso3166Cache.entrySet().parallelStream().distinct()
@@ -212 +213 @@
                 .distinct()
                 .flatMap(code -> Stream.of(taginfoCache, taginfoGeofabrikCache).map(cache -> cache.get(code)))
-                .filter(Objects::nonNull);
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
     }
 }