src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java

rev 47734 : imported patch 8190918

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 120,146 ****
      @SuppressWarnings("unchecked")
      byte[] getBreakIteratorResources(String key) {
          return (byte[]) localeData.getBreakIteratorResources(locale).getObject(key);
      }
  
!     int getCalendarData(String key) {
!         Integer caldata;
          String cacheKey = CALENDAR_DATA  + key;
  
          removeEmptyReferences();
  
          ResourceReference data = cache.get(cacheKey);
!         if (data == null || ((caldata = (Integer) data.get()) == null)) {
              ResourceBundle rb = localeData.getCalendarData(locale);
              if (rb.containsKey(key)) {
!                 caldata = Integer.parseInt(rb.getString(key));
!             } else {
!                 caldata = 0;
              }
  
              cache.put(cacheKey,
!                       new ResourceReference(cacheKey, (Object) caldata, referenceQueue));
          }
  
          return caldata;
      }
  
--- 120,144 ----
      @SuppressWarnings("unchecked")
      byte[] getBreakIteratorResources(String key) {
          return (byte[]) localeData.getBreakIteratorResources(locale).getObject(key);
      }
  
!     public String getCalendarData(String key) {
!         String caldata = "";
          String cacheKey = CALENDAR_DATA  + key;
  
          removeEmptyReferences();
  
          ResourceReference data = cache.get(cacheKey);
!         if (data == null || ((caldata = (String) data.get()) == null)) {
              ResourceBundle rb = localeData.getCalendarData(locale);
              if (rb.containsKey(key)) {
!                 caldata = rb.getString(key);
              }
  
              cache.put(cacheKey,
!                       new ResourceReference(cacheKey, caldata, referenceQueue));
          }
  
          return caldata;
      }