Merge pull request #9 from apptentive/close_streams

Ensure that streams are closed in ApptentiveClient. AND-69
apptentive · Apr 23, 2015 · 05d74b9 · 05d74b9
2 parents 5567c6a + 1d73d62
commit 05d74b9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/apptentive/src/com/apptentive/android/sdk/comm/ApptentiveClient.java b/apptentive/src/com/apptentive/android/sdk/comm/ApptentiveClient.java
@@ -25,7 +25,6 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
-import org.apache.http.util.EntityUtils;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -138,6 +137,7 @@ private static ApptentiveHttpResponse performHttpRequest(String oauthToken, Stri
 
 		ApptentiveHttpResponse ret = new ApptentiveHttpResponse();
 		HttpClient httpClient = null;
+		InputStream is = null;
 		try {
 			HttpRequestBase request;
 			httpClient = new DefaultHttpClient();
@@ -190,7 +190,7 @@ private static ApptentiveHttpResponse performHttpRequest(String oauthToken, Stri
 
 			HttpEntity entity = response.getEntity();
 			if (entity != null) {
-				InputStream is = entity.getContent();
+				is = entity.getContent();
 				if (is != null) {
 					String contentEncoding = ret.getHeaders().get("Content-Encoding");
 					if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
@@ -214,6 +214,7 @@ private static ApptentiveHttpResponse performHttpRequest(String oauthToken, Stri
 			if (httpClient != null) {
 				httpClient.getConnectionManager().shutdown();
 			}
+			Util.ensureClosed(is);
 		}
 		return ret;
 	}