Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #2031300. Set only accept unique objects. So we have to assign different

Browse Source 
value for each cookie when we add them to the SortedSet.
This commit is contained in:
Grace Kloba
2009-08-03 17:35:08 -07:00
parent 7a17cf3418
commit 8ae2777354
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/webkit/CookieManager.java
View File

@@ -197,7 +197,24 @@ public final class CookieManager {
private static final class CookieComparator implements Comparator<Cookie> {
public int compare(Cookie cookie1, Cookie cookie2) {
return cookie2.path.length() - cookie1.path.length();
// According to RFC 2109, multiple cookies are ordered in a way such
// that those with more specific Path attributes precede those with
// less specific. Ordering with respect to other attributes (e.g.,
// Domain) is unspecified.
// As Set is not modified if the two objects are same, we do want to
// assign different value for each cookie.
int diff = cookie2.path.length() - cookie1.path.length();
if (diff == 0) {
diff = cookie2.domain.length() - cookie1.domain.length();
if (diff == 0) {
diff = cookie2.name.hashCode() - cookie1.name.hashCode();
if (diff == 0) {
Log.w(LOGTAG, "Found two cookies with the same value." +
"cookie1=" + cookie1 + " , cookie2=" + cookie2);
}
}
}
return diff;
}
}