Changeset 10403 in josm for trunk

Timestamp:

2016-06-16T17:25:29+02:00 (8 years ago)

Author:

stoecker

Message:

see #12966 - don't mix caching of resource and zip-archive images

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (2 diffs)

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

@@ -840 +840 @@
                     }
 
-                    ImageResource ir = cache.get(cacheName);
-                    if (ir != null) return ir;
-
                     switch (place) {
                     case typeArchive:
                         if (archive != null) {
+                            cacheName = "zip:"+archive+":"+cacheName;
+                            ImageResource ir = cache.get(cacheName);
+                            if (ir != null) return ir;
+
                             ir = getIfAvailableZip(fullName, archive, inArchiveDir, type);
                             if (ir != null) {
@@ -854 +855 @@
                         break;
                     case typeLocal:
+                        ImageResource ir = cache.get(cacheName);
+                        if (ir != null) return ir;
+
                         // getImageUrl() does a ton of "stat()" calls and gets expensive
                         // and redundant when you have a whole ton of objects. So,