andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing #378, when path or domain are null in both this and that, equals and compareTo return false even when the cookies are equal.

Browse Source
This commit is contained in:
James Roper 2012-06-03 01:04:23 +03:00
parent f34fc73e89
commit e8a74c8ad0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java
View File

@ -273,7 +273,7 @@ public class DefaultCookie implements Cookie {
if (getPath() == null && that.getPath() != null) { if (getPath() == null && that.getPath() != null) {
return false; return false;
} else if (that.getPath() == null) { } else if (that.getPath() == null && getPath() != null) {
return false; return false;
} }
if (!getPath().equals(that.getPath())) { if (!getPath().equals(that.getPath())) {
@ -282,7 +282,7 @@ public class DefaultCookie implements Cookie {
if (getDomain() == null && that.getDomain() != null) { if (getDomain() == null && that.getDomain() != null) {
return false; return false;
} else if (that.getDomain() == null) { } else if (that.getDomain() == null && getDomain() != null) {
return false; return false;
} }
return getDomain().equalsIgnoreCase(that.getDomain()); return getDomain().equalsIgnoreCase(that.getDomain());
@ -298,7 +298,7 @@ public class DefaultCookie implements Cookie {
if (getPath() == null && c.getPath() != null) { if (getPath() == null && c.getPath() != null) {
return -1; return -1;
} else if (c.getPath() == null) { } else if (c.getPath() == null && getPath() != null) {
return 1; return 1;
} }
v = getPath().compareTo(c.getPath()); v = getPath().compareTo(c.getPath());
@ -308,7 +308,7 @@ public class DefaultCookie implements Cookie {
if (getDomain() == null && c.getDomain() != null) { if (getDomain() == null && c.getDomain() != null) {
return -1; return -1;
} else if (c.getDomain() == null) { } else if (c.getDomain() == null && getDomain() != null) {
return 1; return 1;
} }
v = getDomain().compareToIgnoreCase(c.getDomain()); v = getDomain().compareToIgnoreCase(c.getDomain());