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

rev 6352 : imported patch 7162007

@@ -24,11 +24,10 @@
  */
 
 package sun.util.locale.provider;
 
 import java.util.Locale;
-import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.spi.LocaleNameProvider;
 
 /**
  * Concrete implementation of the

@@ -172,18 +171,13 @@
     private String getDisplayString(String key, Locale locale) {
         if (key == null || locale == null) {
             throw new NullPointerException();
         }
 
-        ResourceBundle rb = LocaleProviderAdapter.forType(type).getLocaleData().getLocaleNames(locale);
-        if (rb.containsKey(key)) {
-                return rb.getString(key);
+        return LocaleProviderAdapter.forType(type).getLocaleResources(locale).getLocaleName(key);
             }
 
-        return null;
-    }
-
     @Override
     public Set<String> getAvailableLanguageTags() {
         return langtags;
     }
 }