# HG changeset patch
# User naoto
# Date 1591112880 25200
# Node ID e8dc3ef4f0c015cee571c9895882f9a3d05f45a0
# Parent  4646d1205c04786d83fbc4a48ca2fba73387ce38
8245407: Enhance zoning of times
Reviewed-by: rriggs, rhalade, skoivu

diff -r 4646d1205c04 -r e8dc3ef4f0c0 src/share/classes/java/util/Calendar.java
--- 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