Merge pull request android-async-http#93 from sillydong/master

Fix a NullPointerException in JsonHttpResponseHandler if response is not json type

Author: loopj

src/com/loopj/android/http/JsonHttpResponseHandler.java

@@ -108,11 +108,14 @@ protected void handleSuccessJsonMessage(Object jsonResponse) {
     protected Object parseResponse(String responseBody) throws JSONException {
         Object result = null;
         //trim the string to prevent start with blank, and test if the string is valid JSON, because the parser don't do this :(. If Json is not valid this will return null
-	responseBody = responseBody.trim();
-	if(responseBody.startsWith("{") || responseBody.startsWith("[")) {
-	    result = new JSONTokener(responseBody).nextValue();
-	}
-	return result;
+		responseBody = responseBody.trim();
+		if(responseBody.startsWith("{") || responseBody.startsWith("[")) {
+			result = new JSONTokener(responseBody).nextValue();
+		}
+		if (result == null) {
+			result = responseBody;
+		}
+		return result;
     }
 
     @Override