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 committed by Trustin Lee
parent a8c1e3bb77
commit e13ff4ae93
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java
View File

@ -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());