Changeset 16768 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

2020-07-14T20:19:40+02:00 (4 years ago)

Author:

simon04

Message:

fix #19449 ImageProviderTest.testGetPadded has slow startup, and a race condition (patch by johsin18, modified)

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -229 +229 @@
         File arch = TaggingPresetReader.getZipIcons();
         final Collection<String> s = Config.getPref().getList("taggingpreset.icon.sources", null);
-        this.iconFuture = new ImageProvider(iconName)
+        this.iconFuture = new CompletableFuture<>();
+        new ImageProvider(iconName)
             .setDirs(s)
             .setId("presets")
@@ -242 +243 @@
                             Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
                             Logging.warn(e);
+                        } finally {
+                            iconFuture.complete(null);
                         }
                     });
                 } else {
                     Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
+                    iconFuture.complete(null);
                 }
             });