--- old/src/java.base/share/classes/java/text/SimpleDateFormat.java 2018-04-11 09:27:12.794929568 -0700 +++ new/src/java.base/share/classes/java/text/SimpleDateFormat.java 2018-04-11 09:27:12.550925050 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2018, 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 @@ -55,6 +55,7 @@ import sun.util.calendar.CalendarUtils; import sun.util.calendar.ZoneInfoFile; import sun.util.locale.provider.LocaleProviderAdapter; +import sun.util.locale.provider.TimeZoneNameUtility; /** * SimpleDateFormat is a concrete class for formatting and @@ -1691,6 +1692,12 @@ // Checking long and short zones [1 & 2], // and long and short daylight [3 & 4]. String zoneName = zoneNames[i]; + if (zoneName.isEmpty()) { + // fill in by retrieving single name + zoneName = TimeZoneNameUtility.retrieveDisplayName( + zoneNames[0], i >= 3, i % 2, locale); + zoneNames[i] = zoneName; + } if (text.regionMatches(true, start, zoneName, 0, zoneName.length())) { return i;