diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java index d867b67521..38da9c770e 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java @@ -249,7 +249,7 @@ public class DefaultCookie implements Cookie { if (getPath() == null && that.getPath() != null) { return false; - } else if (that.getPath() == null) { + } else if (that.getPath() == null && getPath() != null) { return false; } if (!getPath().equals(that.getPath())) { @@ -258,7 +258,7 @@ public class DefaultCookie implements Cookie { if (getDomain() == null && that.getDomain() != null) { return false; - } else if (that.getDomain() == null) { + } else if (that.getDomain() == null && getDomain() != null) { return false; } if (!getDomain().equalsIgnoreCase(that.getDomain())) { @@ -277,7 +277,7 @@ public class DefaultCookie implements Cookie { if (getPath() == null && c.getPath() != null) { return -1; - } else if (c.getPath() == null) { + } else if (c.getPath() == null && getPath() != null) { return 1; } v = getPath().compareTo(c.getPath()); @@ -287,7 +287,7 @@ public class DefaultCookie implements Cookie { if (getDomain() == null && c.getDomain() != null) { return -1; - } else if (c.getDomain() == null) { + } else if (c.getDomain() == null && getDomain() != null) { return 1; } v = getDomain().compareToIgnoreCase(c.getDomain());