From a7f750369ab30bc46a2fbe8dcbf8fdeb5cc091da Mon Sep 17 00:00:00 2001 From: Josh Stark Date: Sat, 7 Sep 2019 17:37:21 +0100 Subject: [PATCH] Removed explicit format for dates when parsing incoming messages from DockerHub. --- .../fleet/delegate/DockerHubDelegate.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/linuxserver/fleet/delegate/DockerHubDelegate.java b/src/main/java/io/linuxserver/fleet/delegate/DockerHubDelegate.java index e03084b..4baabf5 100644 --- a/src/main/java/io/linuxserver/fleet/delegate/DockerHubDelegate.java +++ b/src/main/java/io/linuxserver/fleet/delegate/DockerHubDelegate.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.util.ArrayList; import java.util.Comparator; @@ -113,16 +112,18 @@ public class DockerHubDelegate { private LocalDateTime parseDockerHubDate(String date) { - if (null == date) + if (null == date) { return null; + } try { - return LocalDateTime.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'")); - } catch (DateTimeParseException e) { - return LocalDateTime.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")); - } catch (Exception e) { - LOGGER.warn("parseDockerHubDate(" + date + ") unable to parse date."); + final String dateToParse = (date.endsWith("Z") ? date.substring(0, date.length() - 1) : date); + return LocalDateTime.parse(dateToParse); + + } catch (DateTimeParseException e) { + + LOGGER.error("parseDockerHubDate(" + date + ") unable to leniently parse date.", e); return null; } }