Merge branch 'issue/1386' of https://github.com/jackyq2015/openrefine into issue/1386

This commit is contained in:
Jacky 2017-12-21 08:23:01 -05:00
commit add2eb936c

View File

@ -198,7 +198,8 @@ public class ParsingUtilities {
if (s.endsWith("Z")) { // UTC time if (s.endsWith("Z")) { // UTC time
Instant instant = Instant.parse(s); Instant instant = Instant.parse(s);
return LocalDateTime.ofInstant(instant, ZoneId.systemDefault()); return LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
} else } else {
return LocalDateTime.parse(s, DateTimeFormatter.ISO_LOCAL_DATE_TIME); return LocalDateTime.parse(s, DateTimeFormatter.ISO_LOCAL_DATE_TIME);
}
} }
} }