infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-26 14:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

8154050: java.time.format.DateTimeFormatter can't parse localized zone-offset

Browse Source 
Corrected the mistake in calculating parse end position

Reviewed-by: rriggs, scolebourne
This commit is contained in:
Nadeesh TV 2016-04-21 17:51:18 +00:00
parent d8acc2fbcf
commit 183d5aad2e
2 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2016, 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
@ -1539,8 +1539,8 @@ public final class DateTimeFormatterBuilder {
* <pre>
* Pattern Count Equivalent builder methods
* ------- ----- --------------------------
* O 1 appendLocalizedOffsetPrefixed(TextStyle.SHORT);
* OOOO 4 appendLocalizedOffsetPrefixed(TextStyle.FULL);
* O 1 appendLocalizedOffset(TextStyle.SHORT);
* OOOO 4 appendLocalizedOffset(TextStyle.FULL);
* X 1 appendOffset("+HHmm","Z")
* XX 2 appendOffset("+HHMM","Z")
* XXX 3 appendOffset("+HH:MM","Z")
@ -3519,9 +3519,7 @@ public final class DateTimeFormatterBuilder {
return false;
}
String gmtText = "GMT"; // TODO: get localized version of 'GMT'
if (gmtText != null) {
buf.append(gmtText);
}
buf.append(gmtText);
int totalSecs = Math.toIntExact(offsetSecs);
if (totalSecs != 0) {
int absHours = Math.abs((totalSecs / 3600) % 100); // anything larger than 99 silently dropped
@ -3565,14 +3563,12 @@ public final class DateTimeFormatterBuilder {
@Override
public int parse(DateTimeParseContext context, CharSequence text, int position) {
int pos = position;
int end = pos + text.length();
int end = text.length();
String gmtText = "GMT"; // TODO: get localized version of 'GMT'
if (gmtText != null) {
if (!context.subSequenceEquals(text, pos, gmtText, 0, gmtText.length())) {
if (!context.subSequenceEquals(text, pos, gmtText, 0, gmtText.length())) {
return ~position;
}
pos += gmtText.length();
}
pos += gmtText.length();
// parse normal plus/minus offset
int negative = 0;
if (pos == end) {

44
jdk/test/java/time/tck/java/time/format/TCKLocalizedOffsetIdPrinterParser.java Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package tck.java.time.format;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Locale;
import org.testng.annotations.Test;
/**
* Test localized behavior of formatter.
*/
@Test
public class TCKLocalizedOffsetIdPrinterParser {
@Test
public void test_localized_offset_parse() {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.S O")
.withLocale(Locale.ENGLISH);
String date = formatter.format(ZonedDateTime.now(ZoneOffset.UTC));
formatter.parse(date) ;
}
}