Checking Content-Length > 0 before reading gzipped data

brothhaar · brothhaar · commit 2d0055d40ccf · 2015-03-02T17:03:48.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>com.mashape.unirest</groupId>
 	<artifactId>unirest-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.4.6-CE-SNAPSHOT</version>
+	<version>1.4.7-CE-SNAPSHOT</version>
 	<name>unirest-java</name>
 	<description>Simplified, lightweight HTTP client library</description>
 	<url>http://unirest.io/</url>
diff --git a/src/main/java/com/mashape/unirest/http/HttpResponse.java b/src/main/java/com/mashape/unirest/http/HttpResponse.java
@@ -50,7 +50,7 @@ public class HttpResponse<T> {
 	@SuppressWarnings("unchecked")
 	public HttpResponse(org.apache.http.HttpResponse response, Class<T> responseClass) {
 		HttpEntity responseEntity = response.getEntity();
-		
+
 		Header[] allHeaders = response.getAllHeaders();
 		for(Header header : allHeaders) {
 			String headerName = header.getName().toLowerCase();
@@ -62,23 +62,24 @@ public HttpResponse(org.apache.http.HttpResponse response, Class<T> responseClas
 		StatusLine statusLine = response.getStatusLine();
 		this.statusCode = statusLine.getStatusCode();
 		this.statusText = statusLine.getReasonPhrase();
-		
+
 		if (responseEntity != null) {
 			String charset = "UTF-8";
-			
+
 			Header contentType = responseEntity.getContentType();
 			if (contentType != null) {
 				String responseCharset = ResponseUtils.getCharsetFromContentType(contentType.getValue());
 				if (responseCharset != null && !responseCharset.trim().equals("")) {
 					charset = responseCharset;
 				}
 			}
-		
+
 			try {
 				byte[] rawBody;
+				Long contentLength = responseEntity.getContentLength();
 				try {
 					InputStream responseInputStream = responseEntity.getContent();
-					if (ResponseUtils.isGzipped(responseEntity.getContentEncoding())) {
+					if (ResponseUtils.isGzipped(responseEntity.getContentEncoding()) && contentLength > 0) {
 						responseInputStream = new GZIPInputStream(responseEntity.getContent());
 					}
 					rawBody = ResponseUtils.getBytes(responseInputStream);
@@ -102,7 +103,7 @@ public HttpResponse(org.apache.http.HttpResponse response, Class<T> responseClas
 				throw new RuntimeException(e);
 			}
 		}
-		
+
 		try {
 			EntityUtils.consume(responseEntity);
 		} catch (IOException e) {
@@ -113,7 +114,7 @@ public HttpResponse(org.apache.http.HttpResponse response, Class<T> responseClas
 	public int getStatus() {
 		return statusCode;
 	}
-	
+
 	public String getStatusText() {
 		return statusText;
 	}
