jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
changeset 14185 916ec0a4d039
parent 13583 dc0017b1a452
child 15260 7af2d7a87806
--- a/jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java	Mon Oct 15 22:34:35 2012 +0100
+++ b/jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java	Tue Oct 16 10:59:21 2012 -0700
@@ -26,10 +26,9 @@
 package sun.util.locale.provider;
 
 import java.util.Locale;
-import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.spi.LocaleNameProvider;
-import sun.util.resources.OpenListResourceBundle;
 
 /**
  * Concrete implementation of the
@@ -175,15 +174,10 @@
             throw new NullPointerException();
         }
 
-        OpenListResourceBundle rb = LocaleProviderAdapter.forType(type).getLocaleData().getLocaleNames(locale);
-        LocaleServiceProviderPool pool =
-                LocaleServiceProviderPool.getPool(LocaleNameProvider.class);
-        try {
-            if (!pool.hasProviders() ||
-                (rb.getLocale().equals(locale) && rb.handleGetKeys().contains(key))) {
+        ResourceBundle rb = LocaleProviderAdapter.forType(type).getLocaleData().getLocaleNames(locale);
+        if (rb.containsKey(key)) {
                 return rb.getString(key);
             }
-        } catch (MissingResourceException mre) {}
 
         return null;
     }