Merge pull request #406 from rocketraman/issue-284

Fix some OkHttp response body leaks

Author: baywet

src/main/java/com/microsoft/graph/http/CoreHttpProvider.java

@@ -269,6 +269,7 @@ public Request authenticateRequest(Request request) {
 					.tag(RetryOptions.class, retryOptions);
 
 			String contenttype = null;
+			Response response = null;
 
 			try {
 				logger.logDebug("Request Method " + request.getHttpMethod().toString());
@@ -353,7 +354,7 @@ public MediaType contentType() {
 				coreHttpRequest = corehttpRequestBuilder.build();
 
 				// Call being executed
-				Response response = corehttpClient.newCall(coreHttpRequest).execute();
+				response = corehttpClient.newCall(coreHttpRequest).execute();
 
 				if (handler != null) {
 					handler.configConnection(response);
@@ -401,12 +402,13 @@ public MediaType contentType() {
 					return (Result) handleBinaryStream(in);
 				}
 			} finally {
-				if (!isBinaryStreamInput && in != null) {
+				if (!isBinaryStreamInput) {
 					try{
-						in.close();
+						if (in != null) in.close();
 					}catch(IOException e) {
 						logger.logError(e.getMessage(), e);
 					}
+					if (response != null) response.close();
 				}
 			}
 		} catch (final GraphServiceException ex) {

src/main/java/com/microsoft/graph/http/GraphServiceException.java

@@ -23,6 +23,7 @@
 package com.microsoft.graph.http;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -38,6 +39,7 @@
 import com.microsoft.graph.serializer.ISerializer;
 
 import okhttp3.Response;
+import static okhttp3.internal.Util.closeQuietly;
 
 /**
  * An exception from the Graph service
@@ -416,8 +418,12 @@ public static <T> GraphServiceException createFromConnection(final IHttpRequest
 
         final String responseMessage = response.message();
         String rawOutput = "{}";
-        if(response.body().byteStream() != null) {
-        	rawOutput = DefaultHttpProvider.streamToString(response.body().byteStream());
+
+        InputStream is = response.body().byteStream();
+        try {
+            rawOutput = DefaultHttpProvider.streamToString(is);
+        } finally {
+            closeQuietly(is);
         }
         GraphErrorResponse error;
         try {