From 127699902ef7b3e14ae7c3effb177fb7e2b9b20d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 14 May 2001 17:40:29 +0000 Subject: SimpleDateFormat.java (parse): Clear DST_OFFSET and ZONE_OFFSET just before computing the time. * java/text/SimpleDateFormat.java (parse): Clear DST_OFFSET and ZONE_OFFSET just before computing the time. From-SVN: r42076 --- libjava/java/text/SimpleDateFormat.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libjava/java/text/SimpleDateFormat.java') diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java index f0976054c63..5b366389c5d 100644 --- a/libjava/java/text/SimpleDateFormat.java +++ b/libjava/java/text/SimpleDateFormat.java @@ -655,8 +655,6 @@ public class SimpleDateFormat extends DateFormat found_zone = true; TimeZone tz = TimeZone.getTimeZone (strings[0]); theCalendar.setTimeZone (tz); - theCalendar.clear (Calendar.DST_OFFSET); - theCalendar.clear (Calendar.ZONE_OFFSET); pos.setIndex(index + strings[k].length()); break; } @@ -709,6 +707,10 @@ public class SimpleDateFormat extends DateFormat try { + // Clear calendar fields here to force getTime() to correctly + // respect DST in the timezone. + theCalendar.clear (Calendar.DST_OFFSET); + theCalendar.clear (Calendar.ZONE_OFFSET); return theCalendar.getTime(); } catch (IllegalArgumentException x) -- cgit v1.2.3