Merge branch 'master' into string-comparison

Author: maxxedev

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

@@ -49,16 +49,20 @@ public class Client {
 
 	private CloseableHttpClient httpClient;
 	private Boolean test;
+	private boolean createdHttpClient;
 
 	/**
 	 * Constructor for using the default CloseableHttpClient.
 	 */
 	public Client() {
-		this(false);
+		this.httpClient = HttpClients.createDefault();
+		this.test = false;
+		this.createdHttpClient = true;
 	}
 
 	/**
-	 * Constructor for passing in an httpClient.
+	 * Constructor for passing in an httpClient, typically for mocking. Passed-in httpClient will not be closed
+	 * by this Client.
 	 *
 	 * @param httpClient
 	 *            an Apache CloseableHttpClient
@@ -88,6 +92,7 @@ public Client(Boolean test) {
 	public Client(CloseableHttpClient httpClient, Boolean test) {
 		this.httpClient = httpClient;
 		this.test = test;
+		this.createdHttpClient = true;
 	}
 
 
@@ -340,7 +345,9 @@ public Response api(Request request) throws IOException {
 	@Override
 	public void finalize() throws Throwable {
 		try {
-			this.httpClient.close();
+			if(this.createdHttpClient) {
+				this.httpClient.close();
+			}
 		} catch(IOException e) {
 			throw new Throwable(e.getMessage());
 		} finally {