Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复MemoryCookieStore的saveCookie异常 #477

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修复MemoryCookieStore的saveCookie异常 #477

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 32 additions & 15 deletions okgo/src/main/java/com/lzy/okgo/cookie/store/MemoryCookieStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
* 创建日期：2016/1/14
* 描 述：Cookie 的内存管理
* 修订历史：
* 2017/10/7 为saveCookie系列方法添加判空
* ================================================
*/
public class MemoryCookieStore implements CookieStore {
Expand All @@ -40,28 +41,40 @@ public class MemoryCookieStore implements CookieStore {
@Override
public synchronized void saveCookie(HttpUrl url, List<Cookie> cookies) {
List<Cookie> oldCookies = memoryCookies.get(url.host());
List<Cookie> needRemove = new ArrayList<>();
for (Cookie newCookie : cookies) {
for (Cookie oldCookie : oldCookies) {
if (newCookie.name().equals(oldCookie.name())) {
needRemove.add(oldCookie);
if (oldCookies == null) {
oldCookies = new ArrayList<>();
memoryCookies.put(url.host(), oldCookies);
}else {
List<Cookie> needRemove = new ArrayList<>();
for (Cookie newCookie : cookies) {
for (Cookie oldCookie : oldCookies) {
if (newCookie.name().equals(oldCookie.name())) {
needRemove.add(oldCookie);
}
}
}
oldCookies.removeAll(needRemove);
}
oldCookies.removeAll(needRemove);
oldCookies.addAll(cookies);
}

@Override
public synchronized void saveCookie(HttpUrl url, Cookie cookie) {
List<Cookie> cookies = memoryCookies.get(url.host());
List<Cookie> needRemove = new ArrayList<>();
for (Cookie item : cookies) {
if (cookie.name().equals(item.name())) {
needRemove.add(item);

if (cookies == null) {
cookies = new ArrayList<>();
memoryCookies.put(url.host(), cookies);
}else {
List<Cookie> needRemove = new ArrayList<>();
for (Cookie item : cookies) {
if (cookie.name().equals(item.name())) {
needRemove.add(item);
}
}
cookies.removeAll(needRemove);
}
cookies.removeAll(needRemove);

cookies.add(cookie);
}

Expand All @@ -87,10 +100,14 @@ public synchronized List<Cookie> getAllCookie() {

@Override
public List<Cookie> getCookie(HttpUrl url) {
List<Cookie> cookies = new ArrayList<>();
List<Cookie> urlCookies = memoryCookies.get(url.host());
if (urlCookies != null) cookies.addAll(urlCookies);
return cookies;
List<Cookie> cookies = memoryCookies.get(url.host());

if (cookies == null) {
cookies = new ArrayList<>();
memoryCookies.put(url.host(), cookies);
}

return new ArrayList<>(cookies);
}

@Override
Expand Down