commit a0ef298f8d5230af62eb21a9cf65fca85c3a45b5
author Ficus Kirkpatrick <ficus@android.com> Tue Feb 04 02:54:11 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 04 02:54:11 2014 +0000
tree a0140150f5a585f01a510bd3cf9b0ea2bbbc4887
parent 3e26c8e58c63dbb071140d7da9a85fa7b01a29d9
parent 1593ad9b3d0877f8139700ccd3e5d1b65bd92a49

am 1593ad9b: Merge "Volley to create valid NetworkResponse object when cache is disabled"

* commit '1593ad9b3d0877f8139700ccd3e5d1b65bd92a49':
  Volley to create valid NetworkResponse object when cache is disabled

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

diff --git a/src/com/android/volley/toolbox/BasicNetwork.java b/src/com/android/volley/toolbox/BasicNetwork.java
index 5883904..c82fc34 100644
--- a/src/com/android/volley/toolbox/BasicNetwork.java
+++ b/src/com/android/volley/toolbox/BasicNetwork.java
@@ -98,7 +98,8 @@
                 // Handle cache validation.
                 if (statusCode == HttpStatus.SC_NOT_MODIFIED) {
                     return new NetworkResponse(HttpStatus.SC_NOT_MODIFIED,
-                            request.getCacheEntry().data, responseHeaders, true);
+                            request.getCacheEntry() == null ? null : request.getCacheEntry().data,
+                            responseHeaders, true);
                 }
 
                 // Some responses such as 204s do not have content.  We must check.