commit 8992e392faa032fc027b979f578ec3d9195f9d36
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Tue Nov 29 17:03:23 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 29 17:03:23 2016 +0000
tree 850f8908190b9bc309b07b3b7e9ce0a6be74ddc9
parent d92d21812a07a72e19568bf2eb5820d6ec8944fd
parent f8c921c60beae46257a55581ce16da6be9a9e09e

Merge "Fix bug in expires time calculation"

ojluni/src/main/java/java/net/HttpCookie.java

diff --git a/ojluni/src/main/java/java/net/HttpCookie.java b/ojluni/src/main/java/java/net/HttpCookie.java
index 8aae078..3cdd438 100644
--- a/ojluni/src/main/java/java/net/HttpCookie.java
+++ b/ojluni/src/main/java/java/net/HttpCookie.java
@@ -1013,8 +1013,8 @@
                         long maxAgeInSeconds = 0;
                         if (date != null) {
                             maxAgeInSeconds = (date.getTime() - cookie.whenCreated) / 1000;
-                            // If "expires" is in the past, remove the cookie.
-                            if (maxAgeInSeconds < 0) {
+                            // Avoid MAX_AGE_UNSPECIFIED
+                            if (maxAgeInSeconds == MAX_AGE_UNSPECIFIED) {
                                 maxAgeInSeconds = 0;
                             }
                         }