Skip to content

Avoid unnecessary use of Instant.toEpochMilli #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ok2c merged 1 commit into from
Jun 26, 2022
+3 −3
Merged

Avoid unnecessary use of Instant.toEpochMilli #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand Down