diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-28 03:57:05 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-28 03:57:05 +0000 |
| commit | ae58cadbc86c39be11c20a569e7f5a448271946f (patch) | |
| tree | 1f190a9670bb00f14812ffcf46e0fd58cd25a85a /libjava/java/text/SimpleDateFormat.java | |
| parent | fc1989973d6b413777cbd470841dda2e41706acb (diff) | |
| download | ppe42-gcc-ae58cadbc86c39be11c20a569e7f5a448271946f.tar.gz ppe42-gcc-ae58cadbc86c39be11c20a569e7f5a448271946f.zip | |
* java/text/SimpleDateFormat (parse): Revert patch of 2003-09-25.
Don't call setTimeZone on calendar.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71870 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/text/SimpleDateFormat.java')
| -rw-r--r-- | libjava/java/text/SimpleDateFormat.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java index f41a27bbc4d..84bc49be298 100644 --- a/libjava/java/text/SimpleDateFormat.java +++ b/libjava/java/text/SimpleDateFormat.java @@ -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) { |
