commit 04884d344043063aaff1bef567912e1be0f254ff
author Ficus Kirkpatrick <ficus@android.com> Mon Mar 31 01:28:39 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 31 01:28:40 2014 +0000
tree d8b02f21d3fe431d37c7dae668833879a7b0c0b9
parent 6c339176312237f7786851602916f7f44c61dfb8
parent ee9d4500c337d5d2371651764dfcbbf8d5502757

Merge "ImageLoader: setError after null check"

src/com/android/volley/toolbox/ImageLoader.java

diff --git a/src/com/android/volley/toolbox/ImageLoader.java b/src/com/android/volley/toolbox/ImageLoader.java
index c5f52a0..fe0f32a 100644
--- a/src/com/android/volley/toolbox/ImageLoader.java
+++ b/src/com/android/volley/toolbox/ImageLoader.java
@@ -275,10 +275,10 @@
         // Remove this request from the list of in-flight requests.
         BatchedImageRequest request = mInFlightRequests.remove(cacheKey);
 
-        // Set the error for this request
-        request.setError(error);
-
         if (request != null) {
+            // Set the error for this request
+            request.setError(error);
+
             // Send the batched response
             batchResponse(cacheKey, request);
         }