diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java b/httpclient5/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java index 4fe5decd8..bb1f00adf 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java @@ -27,13 +27,13 @@ package org.apache.hc.client5.http.utils; +import java.time.DateTimeException; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; -import java.time.format.DateTimeParseException; import java.util.Date; import java.util.Locale; import java.util.TimeZone; @@ -145,6 +145,8 @@ public static LocalDateTime toUTC(final Date date) { /** * Parses the date value using the given date/time formats. + *
This method can handle strings without time-zone information by failing gracefully, in which case + * it returns {@code null}.
* * @param dateValue the instant value to parse * @param dateFormatters the date/time formats to use @@ -165,7 +167,7 @@ public static Instant parseDate(final String dateValue, final DateTimeFormatter. for (final DateTimeFormatter dateFormatter : dateFormatters) { try { return Instant.from(dateFormatter.parse(v)); - } catch (final DateTimeParseException ignore) { + } catch (final DateTimeException ignore) { } } return null; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java index d3b9662ef..155068142 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java @@ -84,6 +84,7 @@ public void testDateParseMessage() throws Exception { @Test public void testMalformedDate() { Assertions.assertNull(DateUtils.parseDate("Fri, 14 Oct 2005 00:00:00 GMT", new DateTimeFormatter[] {})); + Assertions.assertNull(DateUtils.parseDate("Thu Feb 22 17:20:18 2024", new DateTimeFormatter[] {})); } @Test