From bdde5a20f607a7b65489ed6db5094852bc4f0b53 Mon Sep 17 00:00:00 2001 From: norman Date: Mon, 30 Jul 2012 07:44:53 +0200 Subject: [PATCH] Allow to set Expires attribute to a date in theast. See #479 --- .../src/main/java/io/netty/handler/codec/http/Cookie.java | 4 ++-- .../main/java/io/netty/handler/codec/http/DefaultCookie.java | 2 +- .../java/io/netty/handler/codec/http/ServerCookieEncoder.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/Cookie.java b/codec-http/src/main/java/io/netty/handler/codec/http/Cookie.java index 4cd1109c72..8849cf0f77 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/Cookie.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/Cookie.java @@ -87,7 +87,7 @@ public interface Cookie extends Comparable { void setComment(String comment); /** - * Returns the maximum age of this {@link Cookie} in seconds. + * Returns the maximum age of this {@link Cookie} in seconds or {@link Long#MIN_VALUE} if unspecified * * @return The maximum age of this {@link Cookie} */ @@ -97,7 +97,7 @@ public interface Cookie extends Comparable { * Sets the maximum age of this {@link Cookie} in seconds. * If an age of {@code 0} is specified, this {@link Cookie} will be * automatically removed by browser because it will expire immediately. - * If {@code -1} is specified, this {@link Cookie} will be removed when the + * If {@link Long#MIN_VALUE} is specified, this {@link Cookie} will be removed when the * browser is closed. * * @param maxAge The maximum age of this {@link Cookie} in seconds diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java index 81a9b93ebf..98ee92bc5b 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java @@ -35,7 +35,7 @@ public class DefaultCookie implements Cookie { private boolean discard; private Set ports = Collections.emptySet(); private Set unmodifiablePorts = ports; - private long maxAge = -1; + private long maxAge = Long.MIN_VALUE; private int version; private boolean secure; private boolean httpOnly; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java index 4c917f52db..4a0c56d2d5 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java @@ -54,7 +54,7 @@ public final class ServerCookieEncoder { add(buf, cookie.getName(), cookie.getValue()); - if (cookie.getMaxAge() >= 0) { + if (cookie.getMaxAge() != Long.MIN_VALUE) { if (cookie.getVersion() == 0) { addUnquoted(buf, CookieHeaderNames.EXPIRES, new HttpHeaderDateFormat().format(