Print this page
rev 5931 : imported patch 8000245.8000273.8000615

Split Close
Expand all
Collapse all
          --- old/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
          +++ new/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
↓ open down ↓ 171 lines elided ↑ open up ↑
 172  172  
 173  173      private String getDisplayString(String key, Locale locale) {
 174  174          if (key == null || locale == null) {
 175  175              throw new NullPointerException();
 176  176          }
 177  177  
 178  178          OpenListResourceBundle rb = LocaleProviderAdapter.forType(type).getLocaleData().getLocaleNames(locale);
 179  179          LocaleServiceProviderPool pool =
 180  180                  LocaleServiceProviderPool.getPool(LocaleNameProvider.class);
 181  181          try {
 182      -            if (!pool.hasProviders() ||
 183      -                (rb.getLocale().equals(locale) && rb.handleGetKeys().contains(key))) {
 184      -                return rb.getString(key);
 185      -            }
      182 +            return rb.getString(key);
 186  183          } catch (MissingResourceException mre) {}
 187  184  
 188  185          return null;
 189  186      }
 190  187  
 191  188      @Override
 192  189      public Set<String> getAvailableLanguageTags() {
 193  190          return langtags;
 194  191      }
 195  192  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX