--- a/jdk/src/share/classes/java/util/Calendar.java Sun Nov 11 10:05:37 2012 +0000
+++ b/jdk/src/share/classes/java/util/Calendar.java Mon Nov 12 11:12:29 2012 +0900
@@ -2699,12 +2699,9 @@
/* try to get the Locale data from the cache */
int[] data = cachedLocaleData.get(desiredLocale);
if (data == null) { /* cache miss */
- LocaleProviderAdapter adapter = LocaleProviderAdapter.getAdapter(CalendarDataProvider.class, desiredLocale);
- CalendarDataProvider provider = adapter.getCalendarDataProvider();
data = new int[2];
- data[0] = provider.getFirstDayOfWeek(desiredLocale);
- data[1] = provider.getMinimalDaysInFirstWeek(desiredLocale);
- assert data[0] != 0 && data[1] != 0;
+ data[0] = CalendarDataUtility.retrieveFirstDayOfWeek(desiredLocale);
+ data[1] = CalendarDataUtility.retrieveMinimalDaysInFirstWeek(desiredLocale);
cachedLocaleData.putIfAbsent(desiredLocale, data);
}
firstDayOfWeek = data[0];