commit 3ef4fddf743acf3137b1f67cb43406acba7c1019
author Ficus Kirkpatrick <ficus@android.com> Thu Sep 12 13:37:29 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 12 13:37:29 2013 -0700
tree 51fbd0df28fa4c5e1db1c3a727d89b629af596c6
parent c2866a74b7fc15c790db0f04164bd81f11b6b3c5
parent faa2a13dce6f8a1022e7cd9f04cdd75bfd280746

am faa2a13d: Merge "Support no-content (204) requests in BasicNetwork."

* commit 'faa2a13dce6f8a1022e7cd9f04cdd75bfd280746':
  Support no-content (204) requests in BasicNetwork.

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 b3c7d45..3c1d5c7 100644
--- a/src/com/android/volley/toolbox/BasicNetwork.java
+++ b/src/com/android/volley/toolbox/BasicNetwork.java
@@ -101,7 +101,15 @@
                             request.getCacheEntry().data, responseHeaders, true);
                 }
 
-                responseContents = entityToBytes(httpResponse.getEntity());
+                // Some responses such as 204s do not have content.  We must check.
+                if (httpResponse.getEntity() != null) {
+                  responseContents = entityToBytes(httpResponse.getEntity());
+                } else {
+                  // Add 0 byte response as a way of honestly representing a
+                  // no-content request.
+                  responseContents = new byte[0];
+                }
+
                 // if the request is slow, log it.
                 long requestLifetime = SystemClock.elapsedRealtime() - requestStart;
                 logSlowRequests(requestLifetime, request, responseContents, statusLine);