diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-08-30 14:26:10 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-09-01 11:00:56 +0200 |
commit | 87c19be24efe3d723be1f1d09dfc54f0374f380d (patch) | |
tree | db88d8e2ab2c70e6d13bce81a458412ce1283e33 /jdisc_http_service | |
parent | 057535ccddc091f54ea5484241373ea1ac00bdca (diff) |
Store maxage as seconds
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java index 777ed7a6cee..a43310aff51 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java @@ -38,7 +38,7 @@ public class Cookie { private String path; private String comment; private String commentUrl; - private long maxAgeMillis = TimeUnit.SECONDS.toMillis(Integer.MIN_VALUE); + private long maxAgeSeconds = Integer.MIN_VALUE; private int version; private boolean secure; private boolean httpOnly; @@ -55,7 +55,7 @@ public class Cookie { path = cookie.path; comment = cookie.comment; commentUrl = cookie.commentUrl; - maxAgeMillis = cookie.maxAgeMillis; + maxAgeSeconds = cookie.maxAgeSeconds; version = cookie.version; secure = cookie.secure; httpOnly = cookie.httpOnly; @@ -136,11 +136,11 @@ public class Cookie { } public int getMaxAge(TimeUnit unit) { - return (int)unit.convert(maxAgeMillis, TimeUnit.MILLISECONDS); + return (int)unit.convert(maxAgeSeconds, TimeUnit.SECONDS); } public Cookie setMaxAge(int maxAge, TimeUnit unit) { - this.maxAgeMillis = unit.toMillis(maxAge); + this.maxAgeSeconds = maxAge >= 0 ? unit.toSeconds(maxAge) : Integer.MIN_VALUE; return this; } @@ -194,7 +194,7 @@ public class Cookie { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Cookie cookie = (Cookie) o; - return maxAgeMillis == cookie.maxAgeMillis && + return maxAgeSeconds == cookie.maxAgeSeconds && version == cookie.version && secure == cookie.secure && httpOnly == cookie.httpOnly && @@ -210,7 +210,7 @@ public class Cookie { @Override public int hashCode() { - return Objects.hash(ports, name, value, domain, path, comment, commentUrl, maxAgeMillis, version, secure, httpOnly, discard); + return Objects.hash(ports, name, value, domain, path, comment, commentUrl, maxAgeSeconds, version, secure, httpOnly, discard); } @Override @@ -258,8 +258,7 @@ public class Cookie { cookie.setComment(servletCookie.getComment()); cookie.setPath(servletCookie.getPath()); cookie.setDomain(servletCookie.getDomain()); - int maxAge = servletCookie.getMaxAge(); - cookie.setMaxAge(maxAge != -1 ? maxAge : Integer.MIN_VALUE, TimeUnit.SECONDS); + cookie.setMaxAge(servletCookie.getMaxAge(), TimeUnit.SECONDS); cookie.setSecure(servletCookie.getSecure()); cookie.setVersion(servletCookie.getVersion()); cookie.setHttpOnly(servletCookie.isHttpOnly()); @@ -306,8 +305,7 @@ public class Cookie { cookie.setDiscard(httpCookie.getDiscard()); cookie.setDomain(httpCookie.getDomain()); cookie.setHttpOnly(httpCookie.isHttpOnly()); - int maxAge = (int) httpCookie.getMaxAge(); - cookie.setMaxAge(maxAge != -1 ? maxAge : Integer.MIN_VALUE, TimeUnit.SECONDS); + cookie.setMaxAge((int)httpCookie.getMaxAge(), TimeUnit.SECONDS); cookie.setPath(httpCookie.getPath()); cookie.setSecure(httpCookie.getSecure()); cookie.setVersion(httpCookie.getVersion()); |