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

*** 124,161 ****
       * @param c class of the locale sensitive service
       */
      private LocaleServiceProviderPool (final Class<? extends LocaleServiceProvider> c) {
          providerClass = c;
  
!         // Add the JRE Locale Data Adapter implementation.
!         providers.putIfAbsent(LocaleProviderAdapter.Type.JRE,
!             LocaleProviderAdapter.forJRE().getLocaleServiceProvider(c));
! 
!         // Add the SPI Locale Data Adapter implementation.
!         LocaleProviderAdapter lda = LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.SPI);
          LocaleServiceProvider provider = lda.getLocaleServiceProvider(c);
          if (provider != null) {
!             providers.putIfAbsent(LocaleProviderAdapter.Type.SPI, provider);
          }
- 
-         // Add the CLDR Locale Data Adapter implementation, if needed.
-         lda =  LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR);
-         if (lda != null) {
-             provider = lda.getLocaleServiceProvider(c);
-             if (provider != null) {
-                 providers.putIfAbsent(LocaleProviderAdapter.Type.CLDR, provider);
              }
          }
- 
-         // Add the Host Locale Data Adapter implementation, if needed.
-         lda =  LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.HOST);
-         if (lda != null) {
-             provider = lda.getLocaleServiceProvider(c);
-             if (provider != null) {
-                 providers.putIfAbsent(LocaleProviderAdapter.Type.HOST, provider);
-             }
-         }
      }
  
      static void config(Class<? extends Object> caller, String message) {
          PlatformLogger logger = PlatformLogger.getLogger(caller.getCanonicalName());
          logger.config(message);
--- 124,142 ----
       * @param c class of the locale sensitive service
       */
      private LocaleServiceProviderPool (final Class<? extends LocaleServiceProvider> c) {
          providerClass = c;
  
!         for (LocaleProviderAdapter.Type type : LocaleProviderAdapter.getAdapterPreference()) {
!             LocaleProviderAdapter lda = LocaleProviderAdapter.forType(type);
!             if (lda != null) {
                  LocaleServiceProvider provider = lda.getLocaleServiceProvider(c);
                  if (provider != null) {
!                     providers.putIfAbsent(type, provider);
                  }
              }
          }
      }
  
      static void config(Class<? extends Object> caller, String message) {
          PlatformLogger logger = PlatformLogger.getLogger(caller.getCanonicalName());
          logger.config(message);