Fix merge failure in addCookie

loopj · loopj · commit e050d5dd790b · 2011-12-02T16:41:20.000-08:00
diff --git a/src/com/loopj/android/http/PersistentCookieStore.java b/src/com/loopj/android/http/PersistentCookieStore.java
@@ -89,9 +89,6 @@ public void addCookie(Cookie cookie) {
             cookies.remove(name);
         }
 
-        // Save cookie into local store
-        cookies.put(name, cookie);
-
         // Save cookie into persistent store
         SharedPreferences.Editor prefsWriter = cookiePrefs.edit();
         prefsWriter.putString(COOKIE_NAME_STORE, TextUtils.join(",", cookies.keySet()));

Original file line number	Diff line number	Diff line change
`@@ -89,9 +89,6 @@ public void addCookie(Cookie cookie) {`
`89`	`89`	`cookies.remove(name);`
`90`	`90`	`}`
`91`	`91`
`92`		`- // Save cookie into local store`
`93`		`- cookies.put(name, cookie);`
`94`		`-`
`95`	`92`	`// Save cookie into persistent store`
`96`	`93`	`SharedPreferences.Editor prefsWriter = cookiePrefs.edit();`
`97`	`94`	`prefsWriter.putString(COOKIE_NAME_STORE, TextUtils.join(",", cookies.keySet()));`