From: Tom Tromey <tromey@redhat.com>
Date: Mon, 14 May 2001 17:40:29 +0000 (+0000)
Subject: SimpleDateFormat.java (parse): Clear DST_OFFSET and ZONE_OFFSET just before computing... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=127699902ef7b3e14ae7c3effb177fb7e2b9b20d;p=gcc.git

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
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 56784e0dbe3..e7baaadcb57 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-14  Tom Tromey  <tromey@redhat.com>
+
+	* java/text/SimpleDateFormat.java (parse): Clear DST_OFFSET and
+	ZONE_OFFSET just before computing the time.
+
 2001-05-12  Zack Weinberg  <zackw@stanford.edu>
 
 	* Makefile.am (libgcj_la_OBJECTS): Remove libsupc++convenience.la.
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)