--- a/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java Fri Dec 02 18:03:46 2016 -0800
+++ b/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java Mon Dec 05 12:53:53 2016 +0530
@@ -119,6 +119,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import sun.text.spi.JavaTimeDateTimePatternProvider;
import sun.util.locale.provider.LocaleProviderAdapter;
import sun.util.locale.provider.LocaleResources;
import sun.util.locale.provider.TimeZoneNameUtility;
@@ -212,9 +213,10 @@
if (dateStyle == null && timeStyle == null) {
throw new IllegalArgumentException("Either dateStyle or timeStyle must be non-null");
}
- LocaleResources lr = LocaleProviderAdapter.getResourceBundleBased().getLocaleResources(locale);
- String pattern = lr.getJavaTimeDateTimePattern(
- convertStyle(timeStyle), convertStyle(dateStyle), chrono.getCalendarType());
+ LocaleProviderAdapter adapter = LocaleProviderAdapter.getAdapter(JavaTimeDateTimePatternProvider.class, locale);
+ JavaTimeDateTimePatternProvider provider = adapter.getJavaTimeDateTimePatternProvider();
+ String pattern = provider.getJavaTimeDateTimePattern(convertStyle(timeStyle),
+ convertStyle(dateStyle), chrono.getCalendarType(), locale);
return pattern;
}