Mercurial > hg > release > icedtea7-forest-2.6 > jdk

changeset 9994:e8dc3ef4f0c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8245407: Enhance zoning of times Reviewed-by: rriggs, rhalade, skoivu
author naoto
date Tue, 02 Jun 2020 08:48:00 -0700
parents 4646d1205c04
children dd1fbe9cc20d
files src/share/classes/java/util/Calendar.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/util/Calendar.java	Wed May 20 13:56:21 2020 -0700
+++ b/src/share/classes/java/util/Calendar.java	Tue Jun 02 08:48:00 2020 -0700
@@ -1912,7 +1912,9 @@
                 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