Skip to content

Fix parse position for hour-only timezone offsets #3111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mehuljariwala wants to merge 2 commits into from
Closed

Fix parse position for hour-only timezone offsets #3111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1851780
Fix parse position for hour-only timezone offsets
mehuljariwala Sep 5, 2026
e51a6cb
Scope the legacy Date lint suppression to the timezone test
mehuljariwala Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gson/src/main/java/com/google/gson/internal/bind/util/ISO8601Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,12 @@ public static Date parse(String date, ParsePosition pos) throws ParseException {
offset += 1;
} else if (timezoneIndicator == '+' || timezoneIndicator == '-') {
String timezoneOffset = date.substring(offset);
offset += timezoneOffset.length();

// When timezone has no minutes, we should append it, valid timezones are, for example:
// +00:00, +0000 and +00
timezoneOffset = timezoneOffset.length() >= 5 ? timezoneOffset : timezoneOffset + "00";

offset += timezoneOffset.length();
// 18-Jun-2015, tatu: Minor simplification, skip offset of "+0000"/"+00:00"
if (timezoneOffset.equals("+0000") || timezoneOffset.equals("+00:00")) {
timezone = TIMEZONE_UTC;
Expand Down
24 changes: 24 additions & 0 deletions gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,30 @@ public void testDateParseWithTimezone() throws ParseException {
assertThat(date).isEqualTo(expectedDate);
}

@Test
@SuppressWarnings("JavaUtilDate")
public void testDateParseShortTimezonePosition() throws ParseException {
for (String timezone : new String[] {"+00", "+01", "-02", "+01:30", "+0130"}) {
String dateStr = "2018-06-25T00:00:00" + timezone;
ParsePosition position = new ParsePosition(0);
Date date = ISO8601Utils.parse(dateStr, position);
assertThat(position.getIndex()).isEqualTo(dateStr.length());

String fullTimezone = timezone.length() == 3 ? timezone + ":00" : timezone;
Date expected =
ISO8601Utils.parse("2018-06-25T00:00:00" + fullTimezone, new ParsePosition(0));
assertThat(date.getTime()).isEqualTo(expected.getTime());
}
}

@Test
public void testDateParseShortTimezoneFromNonzeroPosition() throws ParseException {
String dateStr = "prefix 2018-06-25T00:00:00+01";
ParsePosition position = new ParsePosition("prefix ".length());
ISO8601Utils.parse(dateStr, position);
assertThat(position.getIndex()).isEqualTo(dateStr.length());
}

@Test
@SuppressWarnings("UndefinedEquals")
public void testDateParseSpecialTimezone() throws ParseException {
Expand Down