Changeset 16074 in josm for trunk/src/org

Timestamp:

2020-03-08T11:45:44+01:00 (5 years ago)

Author:

simon04

Message:

fix #18884, see #18871 - ImageResource.imgCache: use ConcurrentHashMap

File:

• trunk/src/org/openstreetmap/josm/tools/ImageResource.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.awt.Image;
 import java.awt.image.BufferedImage;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.swing.AbstractAction;
@@ -31 +31 @@
      * Caches the image data for resized versions of the same image.
      */
-    private final Map<Dimension, BufferedImage> imgCache = new HashMap<>(4);
+    private final Map<Dimension, BufferedImage> imgCache = new ConcurrentHashMap<>(4);
     /**
      * SVG diagram information in case of SVG vector image.
@@ -285 +285 @@
     public ImageIcon getPaddedIcon(Dimension iconSize) {
         final Dimension cacheKey = new Dimension(-iconSize.width, -iconSize.height); // use negative width/height for differentiation
-        final BufferedImage image = imgCache.computeIfAbsent(cacheKey, ignore ->
-                ImageProvider.createPaddedIcon(getImageIcon().getImage(), iconSize));
+        BufferedImage image = imgCache.get(cacheKey);
+        if (image == null) {
+            image = ImageProvider.createPaddedIcon(getImageIcon().getImage(), iconSize);
+            imgCache.put(cacheKey, image);
+        }
         return new ImageIcon(image);
     }