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

SimpleDateFormat (parse): Revert patch of 2003-09-25.

Browse Source 
* java/text/SimpleDateFormat (parse): Revert patch of 2003-09-25.
	Don't call setTimeZone on calendar.

From-SVN: r71870
This commit is contained in:
Bryce McKinlay 2003-09-28 03:57:05 +00:00 committed by Bryce McKinlay
parent 5a36731a8d
commit f6b17867e4
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2003-09-28 Bryce McKinlay <bryce@mckinlay.net.nz>
* java/text/SimpleDateFormat (parse): Revert patch of 2003-09-25.
Don't call setTimeZone on calendar.
2003-09-27 Michael Koch <konqueror@gmx.de>
* java/net/URL.java (getURLStreamHandler): Compile fixes.

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

@ -547,9 +547,8 @@ public class SimpleDateFormat extends DateFormat
{
int fmt_index = 0;
int fmt_max = pattern.length();
Calendar loc_calendar = (Calendar)calendar.clone();
loc_calendar.clear();
calendar.clear();
boolean saw_timezone = false;
int quote_start = -1;
boolean is2DigitYear = false;
@ -697,8 +696,7 @@ public class SimpleDateFormat extends DateFormat
found_zone = true;
saw_timezone = true;
TimeZone tz = TimeZone.getTimeZone (strings[0]);
loc_calendar.setTimeZone (tz);
loc_calendar.set (Calendar.ZONE_OFFSET, tz.getRawOffset ());
calendar.set (Calendar.ZONE_OFFSET, tz.getRawOffset ());
offset = 0;
if (k > 2 && tz instanceof SimpleTimeZone)
{
@ -765,17 +763,17 @@ public class SimpleDateFormat extends DateFormat
}
// Assign the value and move on.
loc_calendar.set(calendar_field, value);
calendar.set(calendar_field, value);
}
if (is2DigitYear)
{
// Apply the 80-20 heuristic to dermine the full year based on
// defaultCenturyStart.
int year = defaultCentury + loc_calendar.get(Calendar.YEAR);
loc_calendar.set(Calendar.YEAR, year);
if (loc_calendar.getTime().compareTo(defaultCenturyStart) < 0)
loc_calendar.set(Calendar.YEAR, year + 100);
int year = defaultCentury + calendar.get(Calendar.YEAR);
calendar.set(Calendar.YEAR, year);
if (calendar.getTime().compareTo(defaultCenturyStart) < 0)
calendar.set(Calendar.YEAR, year + 100);
}
try
@ -784,10 +782,10 @@ public class SimpleDateFormat extends DateFormat
{
// Use the real rules to determine whether or not this
// particular time is in daylight savings.
loc_calendar.clear (Calendar.DST_OFFSET);
loc_calendar.clear (Calendar.ZONE_OFFSET);
calendar.clear (Calendar.DST_OFFSET);
calendar.clear (Calendar.ZONE_OFFSET);
}
return loc_calendar.getTime();
return calendar.getTime();
}
catch (IllegalArgumentException x)
{