diff --git a/src/main/java/com/android/volley/CacheDispatcher.java b/src/main/java/com/android/volley/CacheDispatcher.java index 51dfd9c6..b0432f3f 100644 --- a/src/main/java/com/android/volley/CacheDispatcher.java +++ b/src/main/java/com/android/volley/CacheDispatcher.java @@ -229,6 +229,7 @@ public synchronized void onNoUsableResponseReceived(Request request) { } Request nextInLine = waitingRequests.remove(0); mWaitingRequests.put(cacheKey, waitingRequests); + nextInLine.setNetworkRequestCompleteListener(this); try { mCacheDispatcher.mNetworkQueue.put(nextInLine); } catch (InterruptedException iex) { diff --git a/src/test/java/com/android/volley/CacheDispatcherTest.java b/src/test/java/com/android/volley/CacheDispatcherTest.java index 54886f82..a39be7b0 100644 --- a/src/test/java/com/android/volley/CacheDispatcherTest.java +++ b/src/test/java/com/android/volley/CacheDispatcherTest.java @@ -124,6 +124,33 @@ public class CacheDispatcherTest { assertFalse(mDelivery.postResponse_called); } + @Test public void tripleCacheMiss_networkErrorOnFirst() throws Exception { + MockRequest secondRequest = new MockRequest(); + MockRequest thirdRequest = new MockRequest(); + mRequest.setSequence(1); + secondRequest.setSequence(2); + thirdRequest.setSequence(3); + mCacheQueue.add(mRequest); + mCacheQueue.add(secondRequest); + mCacheQueue.add(thirdRequest); + mCacheQueue.waitUntilEmpty(TIMEOUT_MILLIS); + + assertTrue(mNetworkQueue.size() == 1); + assertFalse(mDelivery.postResponse_called); + + Request request = mNetworkQueue.take(); + request.notifyListenerResponseNotUsable(); + // Second request should now be in network queue. + assertTrue(mNetworkQueue.size() == 1); + request = mNetworkQueue.take(); + assertTrue(request.equals(secondRequest)); + // Another unusable response, third request should now be added. + request.notifyListenerResponseNotUsable(); + assertTrue(mNetworkQueue.size() == 1); + request = mNetworkQueue.take(); + assertTrue(request.equals(thirdRequest)); + } + @Test public void duplicateSoftExpiredCacheHit_failedRequest() throws Exception { Cache.Entry entry = CacheTestUtils.makeRandomCacheEntry(null, false, true); mCache.setEntryToReturn(entry);