yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SimpleDateFormat.java (parse): Clear DST_OFFSET and ZONE_OFFSET just before computing the time.

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
libjava/java/text/SimpleDateFormat.java
+4 -2
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)