diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java index 2a80783652..5c95d99eeb 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java @@ -59,7 +59,7 @@ public int compare(final Cookie c1, final Cookie c2) { final Instant d1 = c1.getCreationInstant(); final Instant d2 = c2.getCreationInstant(); if (d1 != null && d2 != null) { - return (int) (d1.toEpochMilli() - d2.toEpochMilli()); + return d1.compareTo(d2); } } return result; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java index 18116da993..004df60a2e 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java @@ -269,7 +269,7 @@ public void setHttpOnly(final boolean httpOnly) { public boolean isExpired(final Date date) { Args.notNull(date, "Date"); return (cookieExpiryDate != null - && cookieExpiryDate.toEpochMilli() <= DateUtils.toInstant(date).toEpochMilli()); + && cookieExpiryDate.compareTo(DateUtils.toInstant(date)) <= 0); } /** @@ -282,7 +282,7 @@ public boolean isExpired(final Date date) { public boolean isExpired(final Instant instant) { Args.notNull(instant, "Instant"); return (cookieExpiryDate != null - && cookieExpiryDate.toEpochMilli() <= instant.toEpochMilli()); + && cookieExpiryDate.compareTo(instant) <= 0); } /**