@@ -557,11 +557,11 @@ * @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); + return ZoneId.of(getID(), ZoneId.SHORT_IDS); } private static TimeZone getTimeZone(String ID, boolean fallback) { TimeZone tz = ZoneInfo.getTimeZone(ID); if (tz == null) {