Do not use EntityUtils#consume, because Android hasn't this medhod be…

…cause of obsolete version of Apache http
rschreijer · Jan 22, 2015 · 381c34e · 381c34e
1 parent 02fe378
commit 381c34e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.mandrillapp.wrapper.lutung</groupId>
     <artifactId>lutung</artifactId>
-    <version>0.0.6-SNAPSHOT</version>
+    <version>0.0.7-SNAPSHOT</version>
     <name>lutung</name>
     <description>Mandrill API Client for Java</description>
     <url>https://github.com/rschreijer/lutung</url>

diff --git a/src/main/java/com/microtripit/mandrillapp/lutung/model/MandrillRequestDispatcher.java b/src/main/java/com/microtripit/mandrillapp/lutung/model/MandrillRequestDispatcher.java
@@ -9,6 +9,7 @@
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import com.microtripit.mandrillapp.lutung.logging.Logger;
 import com.microtripit.mandrillapp.lutung.logging.LoggerFactory;
@@ -101,7 +102,7 @@ public static final <T> T execute(final RequestModel<T> requestModel,
 				responseInputStream.close();
 			}
 			if(response != null) {
-				EntityUtils.consume(response.getEntity());
+				consume(response.getEntity());
 			}
 		}
 	}
@@ -127,6 +128,18 @@ private static final ProxyData detectProxyServer(final String url) {
         }
     }
 
+	private static void consume(HttpEntity entity) throws IOException {
+		if (entity == null) {
+			return;
+		}
+		if (entity.isStreaming()) {
+			InputStream inputStream = entity.getContent();
+			if (inputStream != null) {
+				inputStream.close();
+			}
+		}
+	}
+
     private static final class ProxyData {
         String host;
         int port;