archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8245407: Enhance zoning of times

Browse source 
Reviewed-by: rriggs, rhalade, skoivu
This commit is contained in:
Naoto Sato 2020-06-02 08:48:00 -07:00 • committed by Henry Jen
parent fc5fca9ade
commit d149dcdbd5
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/util/Calendar.java
View file

@ -2728,7 +2728,9 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
lenient == that.lenient &&
firstDayOfWeek == that.firstDayOfWeek &&
minimalDaysInFirstWeek == that.minimalDaysInFirstWeek &&
zone.equals(that.zone);
(zone instanceof ZoneInfo ?
zone.equals(that.zone) :
zone.equals(that.getTimeZone()));
} catch (Exception e) {
// Note: GregorianCalendar.computeTime throws
// IllegalArgumentException if the ERA value is invalid