src/share/classes/java/util/TimeZone.java

*** 557,567 ****
       * @return a {@code ZoneId} representing the same time zone as this
       *         {@code TimeZone}
       * @since 1.8
       */
      public ZoneId toZoneId() {
!         return ZoneId.of(getID(), ZoneId.OLD_IDS_POST_2005);
      }
  
      private static TimeZone getTimeZone(String ID, boolean fallback) {
          TimeZone tz = ZoneInfo.getTimeZone(ID);
          if (tz == null) {
--- 557,567 ----
       * @return a {@code ZoneId} representing the same time zone as this
       *         {@code TimeZone}
       * @since 1.8
       */
      public ZoneId toZoneId() {
!         return ZoneId.of(getID(), ZoneId.SHORT_IDS);
      }
  
      private static TimeZone getTimeZone(String ID, boolean fallback) {
          TimeZone tz = ZoneInfo.getTimeZone(ID);
          if (tz == null) {