commit 5a7bc45f8f662d0673779aad34fc595309d93526
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Wed Jul 15 10:07:50 2015 +0100
committer Narayan Kamath <narayan@google.com> Thu Nov 12 09:09:48 2015 +0000
tree f1110c6aa1e80eac9571808076e92ecda9e4da00
parent b44c7cf87e44e03d2b7b1c9c132e21caceb4f868

Fixes for tests in libcore.java.net.CookiesTest

Fixed InMemoryCookieStore#remove to verify cookie URI before removal
Fixed InMemoryCookieStore#removeAll to return false is it's empty.
Added cookie/url path verification in CookieManager#put.

Change-Id: If7d593ea6209d8da8660224a44187ee1ca070573

ojluni/src/main/java/java/net/CookieManager.java

diff --git a/ojluni/src/main/java/java/net/CookieManager.java b/ojluni/src/main/java/java/net/CookieManager.java
index 532999b..85df889 100755
--- a/ojluni/src/main/java/java/net/CookieManager.java
+++ b/ojluni/src/main/java/java/net/CookieManager.java
@@ -303,7 +303,15 @@
                                 }
                             }
                             cookie.setPath(path);
+                        /* ----- BEGIN android -----
+                           Added path validation code */
+                        } else {
+                            // Validate existing path
+                            if (!pathMatches(uri.getPath(), cookie.getPath())) {
+                                continue;
+                            }
                         }
+                        /* ----- END android ----- */
 
                         // As per RFC 2965, section 3.3.1:
                         // Domain  Defaults to the effective request-host.  (Note that because

ojluni/src/main/java/java/net/InMemoryCookieStore.java

diff --git a/ojluni/src/main/java/java/net/InMemoryCookieStore.java b/ojluni/src/main/java/java/net/InMemoryCookieStore.java
index e885cdd..217dc5f 100755
--- a/ojluni/src/main/java/java/net/InMemoryCookieStore.java
+++ b/ojluni/src/main/java/java/net/InMemoryCookieStore.java
@@ -192,7 +192,14 @@
         boolean modified = false;
         lock.lock();
         try {
-            modified = cookieJar.remove(ck);
+            /* ----- BEGIN android -----
+               Added uri check */
+            if (uri != null && uriIndex.get(uri) == null) {
+                modified = false;
+            } else {
+              /* ----- END android ----- */
+                modified = cookieJar.remove(ck);
+            }
         } finally {
             lock.unlock();
         }
@@ -206,7 +213,12 @@
      */
     public boolean removeAll() {
         lock.lock();
+        /* ----- BEGIN android -----
+        // Added result var */
+        boolean result = false;
+
         try {
+            result = !cookieJar.isEmpty();
             cookieJar.clear();
             domainIndex.clear();
             uriIndex.clear();
@@ -214,7 +226,7 @@
             lock.unlock();
         }
 
-        return true;
+        return result;
     }