From 6cf3742404df45ee2186f2bc7faf0eb7aaf99279 Mon Sep 17 00:00:00 2001 From: RomainSaury Date: Sun, 22 Apr 2012 19:37:05 +0200 Subject: [PATCH] Remove NullPointerExeption on request with 204 http status code Request returning 204 don't have response body wich resulted in a NullPointerException --- src/com/loopj/android/http/AsyncHttpClient.java | 3 +++ src/com/loopj/android/http/AsyncHttpResponseHandler.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/loopj/android/http/AsyncHttpClient.java b/src/com/loopj/android/http/AsyncHttpClient.java index 83ad73a0a..a5afdc022 100644 --- a/src/com/loopj/android/http/AsyncHttpClient.java +++ b/src/com/loopj/android/http/AsyncHttpClient.java @@ -146,6 +146,9 @@ public void process(HttpRequest request, HttpContext context) { httpClient.addResponseInterceptor(new HttpResponseInterceptor() { public void process(HttpResponse response, HttpContext context) { final HttpEntity entity = response.getEntity(); + if (entity == null) { + return; + } final Header encoding = entity.getContentEncoding(); if (encoding != null) { for (HeaderElement element : encoding.getElements()) { diff --git a/src/com/loopj/android/http/AsyncHttpResponseHandler.java b/src/com/loopj/android/http/AsyncHttpResponseHandler.java index 6eddad6a2..ae1e4e8eb 100644 --- a/src/com/loopj/android/http/AsyncHttpResponseHandler.java +++ b/src/com/loopj/android/http/AsyncHttpResponseHandler.java @@ -211,8 +211,8 @@ void sendResponseMessage(HttpResponse response) { HttpEntity temp = response.getEntity(); if(temp != null) { entity = new BufferedHttpEntity(temp); + responseBody = EntityUtils.toString(entity); } - responseBody = EntityUtils.toString(entity); } catch(IOException e) { sendFailureMessage(e, null); }