OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tom Tromey 2001-05-14 17:40:29 +00:00 committed by Tom Tromey
parent 402d7dfed5
commit 127699902e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

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

6
libjava/java/text/SimpleDateFormat.java
View File

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