diff options
| author | coffeys <none@none> | 2013-04-25 21:12:35 +0100 |
|---|---|---|
| committer | coffeys <none@none> | 2013-04-25 21:12:35 +0100 |
| commit | e6cce0f23910a11bad8bc6ca91a506e017afa148 (patch) | |
| tree | 737d96774ef2400187a50318b632d9cfa0a1c36e /src/share/classes/java/text | |
| parent | cbc8f9429b8b83eeeca4b44dd91ed392bbbeaedc (diff) | |
| download | jdk8u_jdk-e6cce0f23910a11bad8bc6ca91a506e017afa148.tar.gz | |
8000529: Regression: SimpleDateFormat incorrectly parses dates formatted with Z and z pattern letters
Reviewed-by: okutsu
Diffstat (limited to 'src/share/classes/java/text')
| -rw-r--r-- | src/share/classes/java/text/CalendarBuilder.java | 11 | ||||
| -rw-r--r-- | src/share/classes/java/text/SimpleDateFormat.java | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/share/classes/java/text/CalendarBuilder.java b/src/share/classes/java/text/CalendarBuilder.java index 0b73cd2ba9..a8246b676c 100644 --- a/src/share/classes/java/text/CalendarBuilder.java +++ b/src/share/classes/java/text/CalendarBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -91,6 +91,15 @@ class CalendarBuilder { return field[index] > UNSET; } + CalendarBuilder clear(int index) { + if (index == ISO_DAY_OF_WEEK) { + index = DAY_OF_WEEK; + } + field[index] = UNSET; + field[MAX_FIELD + index] = 0; + return this; + } + Calendar establish(Calendar cal) { boolean weekDate = isSet(WEEK_YEAR) && field[WEEK_YEAR] > field[YEAR]; diff --git a/src/share/classes/java/text/SimpleDateFormat.java b/src/share/classes/java/text/SimpleDateFormat.java index 82b48964ee..4e85d0d565 100644 --- a/src/share/classes/java/text/SimpleDateFormat.java +++ b/src/share/classes/java/text/SimpleDateFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1719,7 +1719,7 @@ public class SimpleDateFormat extends DateFormat { // determine the local time. (6645292) int dstAmount = (nameIndex >= 3) ? tz.getDSTSavings() : 0; if (!(useSameName || (nameIndex >= 3 && dstAmount == 0))) { - calb.set(Calendar.DST_OFFSET, dstAmount); + calb.clear(Calendar.ZONE_OFFSET).set(Calendar.DST_OFFSET, dstAmount); } return (start + zoneNames[nameIndex].length()); } |