src/java.base/share/classes/java/util/Calendar.java

rev 55815 : [mq]: 8228465

*** 2203,2213 ****
                                      ERA_MASK|MONTH_MASK|DAY_OF_WEEK_MASK|AM_PM_MASK)) {
              return null;
          }
  
          String calendarType = getCalendarType();
!         if (style == ALL_STYLES || isStandaloneStyle(style) || isNarrowFormatStyle(style)) {
              Map<String, Integer> map;
              map = CalendarDataUtility.retrieveFieldValueNames(calendarType, field, style, locale);
  
              // Perform fallback here to follow the CLDR rules
              if (map == null) {
--- 2203,2214 ----
                                      ERA_MASK|MONTH_MASK|DAY_OF_WEEK_MASK|AM_PM_MASK)) {
              return null;
          }
  
          String calendarType = getCalendarType();
!         if (style == ALL_STYLES || isStandaloneStyle(style) || isNarrowFormatStyle(style) ||
!             field == ERA && (style & SHORT) == SHORT) {
              Map<String, Integer> map;
              map = CalendarDataUtility.retrieveFieldValueNames(calendarType, field, style, locale);
  
              // Perform fallback here to follow the CLDR rules
              if (map == null) {