jdk/src/java.base/share/classes/sun/util/locale/LocaleObjectCache.java
changeset 27067 0e748d185207
parent 25859 3317bb8137f4
equal deleted inserted replaced
27066:d3f0b8d935e6 27067:0e748d185207
    55         CacheEntry<K, V> entry = map.get(key);
    55         CacheEntry<K, V> entry = map.get(key);
    56         if (entry != null) {
    56         if (entry != null) {
    57             value = entry.get();
    57             value = entry.get();
    58         }
    58         }
    59         if (value == null) {
    59         if (value == null) {
       
    60             V newVal = createObject(key);
       
    61             // make sure key is normalized *after* the object creation
       
    62             // so that newVal is assured to be created from a valid key.
    60             key = normalizeKey(key);
    63             key = normalizeKey(key);
    61             V newVal = createObject(key);
       
    62             if (key == null || newVal == null) {
    64             if (key == null || newVal == null) {
    63                 // subclass must return non-null key/value object
    65                 // subclass must return non-null key/value object
    64                 return null;
    66                 return null;
    65             }
    67             }
    66 
    68