src/share/classes/sun/util/locale/provider/LocaleResources.java

*** 44,54 ****
  import java.util.Calendar;
  import java.util.Locale;
  import java.util.ResourceBundle;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
! import sun.util.resources.OpenListResourceBundle;
  
  /**
   * Central accessor to locale-dependent resources.
   *
   * @author Masayoshi Okutsu
--- 44,54 ----
  import java.util.Calendar;
  import java.util.Locale;
  import java.util.ResourceBundle;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
! import sun.util.resources.TimeZoneNamesBundle;
  
  /**
   * Central accessor to locale-dependent resources.
   *
   * @author Masayoshi Okutsu
*** 65,81 ****
      LocaleResources(LocaleProviderAdapter adapter, Locale locale) {
          this.adapter = adapter;
          this.locale = locale;
      }
  
!     public OpenListResourceBundle getTimeZoneNames() {
!         OpenListResourceBundle tznames = (OpenListResourceBundle) cache.get("TimeZoneNames");
          if (tznames == null) {
              tznames = adapter.getLocaleData().getTimeZoneNames(locale);
!             OpenListResourceBundle olrb = (OpenListResourceBundle) cache.putIfAbsent("TimeZoneNames", tznames);
!             if (olrb != null) {
!                 tznames = olrb;
              }
          }
          return tznames;
      }
  
--- 65,81 ----
      LocaleResources(LocaleProviderAdapter adapter, Locale locale) {
          this.adapter = adapter;
          this.locale = locale;
      }
  
!     public TimeZoneNamesBundle getTimeZoneNames() {
!         TimeZoneNamesBundle tznames = (TimeZoneNamesBundle) cache.get("TimeZoneNames");
          if (tznames == null) {
              tznames = adapter.getLocaleData().getTimeZoneNames(locale);
!             TimeZoneNamesBundle tznb = (TimeZoneNamesBundle) cache.putIfAbsent("TimeZoneNames", tznames);
!             if (tznb != null) {
!                 tznames = tznb;
              }
          }
          return tznames;
      }