Skip to content

Commit 0824d6c

Browse files
committed
Now properly handles dates using UTC zone name (#333).
1 parent 4385a56 commit 0824d6c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/main/java/org/gitlab4j/api/utils/ISO8601.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,16 @@ public static Instant toInstant(String dateTimeString) throws ParseException {
140140
}
141141

142142
dateTimeString = dateTimeString.trim();
143-
if (dateTimeString.endsWith("Z") || dateTimeString.endsWith("UTC")) {
143+
144+
if (dateTimeString.endsWith("Z")) {
144145
return (Instant.parse(dateTimeString));
145146
} else {
146147

148+
// Convert UTC zoned dates to 0 offset date
149+
if (dateTimeString.endsWith("UTC")) {
150+
dateTimeString = dateTimeString.replace("UTC", "+0000");
151+
}
152+
147153
OffsetDateTime odt = (dateTimeString.length() > 25 ?
148154
OffsetDateTime.parse(dateTimeString, ODT_WITH_MSEC_PARSER) :
149155
OffsetDateTime.parse(dateTimeString, ODT_PARSER));

0 commit comments

Comments
 (0)