Make sure that httpClient frees resources when Send Grid Client goes out of scope

Author: bluestealth

src/main/java/com/sendgrid/Client.java

@@ -278,18 +278,20 @@ public Response delete(Request request) throws URISyntaxException, IOException {
 	}
 
 	private Response executeApiCall(HttpRequestBase httpPost) throws IOException {
-		CloseableHttpResponse serverResponse = httpClient.execute(httpPost);
 		try {
-			Response response = getResponse(serverResponse);
-			if(response.getStatusCode() >= 300) {
-				//throwing IOException here to not break API behavior.
-				throw new IOException("Request returned status Code "+response.getStatusCode()+"Body:"+response.getBody());
+			CloseableHttpResponse serverResponse = httpClient.execute(httpPost);
+			try {
+				Response response = getResponse(serverResponse);
+				if(response.getStatusCode() >= 300) {
+					//throwing IOException here to not break API behavior.
+					throw new IOException("Request returned status Code "+response.getStatusCode()+"Body:"+response.getBody());
+				}
+				return response;
+			} finally {
+				serverResponse.close();
 			}
-			return response;
 		} catch(ClientProtocolException e) {
 			throw new IOException(e.getMessage());
-		} finally {
-			serverResponse.close();
 		}
 	}
 
@@ -323,4 +325,15 @@ public Response api(Request request) throws IOException {
 			throw new IOException(errors.toString());
 		}
 	}
+
+	@Override
+	public void finalize() throws Throwable {
+		try {
+			this.httpClient.close();
+		} catch(IOException e) {
+			throw new Throwable(e.getMessage());
+		} finally {
+			super.finalize();
+		}
+	}
 }