From 798a6d061cc6c050e7396d6f58d47e6a20ea989b Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 17 Jul 2023 23:42:26 +0200 Subject: [PATCH] jsvg: use String instead of URL as cache key to avoid this problem: https://errorprone.info/bugpattern/URLEqualsHashCode --- .../main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java index ebc31143..76117603 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java @@ -63,7 +63,7 @@ public class FlatSVGIcon implements DisabledIconProvider { // cache that uses soft references for values, which allows freeing SVG documents if no longer used - private static final SoftCache svgCache = new SoftCache<>(); + private static final SoftCache svgCache = new SoftCache<>(); private static final SVGLoader svgLoader = new SVGLoader(); private final String name; @@ -485,7 +485,8 @@ public class FlatSVGIcon static synchronized SVGDocument loadSVG( URL url ) { // get from our cache - SVGDocument document = svgCache.get( url ); + String cacheKey = url.toString(); + SVGDocument document = svgCache.get( cacheKey ); if( document != null ) return document; @@ -497,7 +498,7 @@ public class FlatSVGIcon return null; } - svgCache.put( url, document ); + svgCache.put( cacheKey, document ); return document; }