jdk/src/share/classes/java/util/TimeZone.java
changeset 15260 7af2d7a87806
parent 14765 0987999ed367
child 15658 55b829ca2334
--- a/jdk/src/share/classes/java/util/TimeZone.java	Sun Jan 13 19:57:06 2013 -0500
+++ b/jdk/src/share/classes/java/util/TimeZone.java	Mon Jan 14 11:09:53 2013 -0800
@@ -430,32 +430,7 @@
     }
 
     private static String[] getDisplayNames(String id, Locale locale) {
-        Map<String, SoftReference<Map<Locale, String[]>>> displayNames = DisplayNames.CACHE;
-
-        SoftReference<Map<Locale, String[]>> ref = displayNames.get(id);
-        if (ref != null) {
-            Map<Locale, String[]> perLocale = ref.get();
-            if (perLocale != null) {
-                String[] names = perLocale.get(locale);
-                if (names != null) {
-                    return names;
-                }
-                names = TimeZoneNameUtility.retrieveDisplayNames(id, locale);
-                if (names != null) {
-                    perLocale.put(locale, names);
-                }
-                return names;
-            }
-        }
-
-        String[] names = TimeZoneNameUtility.retrieveDisplayNames(id, locale);
-        if (names != null) {
-            Map<Locale, String[]> perLocale = new ConcurrentHashMap<>();
-            perLocale.put(locale, names);
-            ref = new SoftReference<>(perLocale);
-            displayNames.put(id, ref);
-        }
-        return names;
+        return TimeZoneNameUtility.retrieveDisplayNames(id, locale);
     }
 
     /**