diff --git a/core/java/android/net/http/RequestQueue.java b/core/java/android/net/http/RequestQueue.java index b6f295edf8342..e14af6650d38f 100644 --- a/core/java/android/net/http/RequestQueue.java +++ b/core/java/android/net/http/RequestQueue.java @@ -561,9 +561,8 @@ public class RequestQueue implements RequestFeeder { if (mNetworkConnected && mPending.containsKey(host)) { LinkedList reqList = mPending.get(host); - if (!reqList.isEmpty()) { - ret = reqList.removeFirst(); - } else { + ret = reqList.removeFirst(); + if (reqList.isEmpty()) { mPending.remove(host); } } @@ -624,9 +623,8 @@ public class RequestQueue implements RequestFeeder { if (iter.hasNext()) { Map.Entry> entry = iter.next(); LinkedList reqList = entry.getValue(); - if (!reqList.isEmpty()) { - ret = reqList.removeFirst(); - } else { + ret = reqList.removeFirst(); + if (reqList.isEmpty()) { requestQueue.remove(entry.getKey()); } }