Merge branch 'release-3.0.5.1' into 3.0-master

Author: kkanthet

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.marklogic</groupId>
 	<artifactId>java-client-api</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.5</version>
+	<version>3.0.5.1</version>
 	<name>MarkLogic Java Client API</name>
 	<description>The official MarkLogic Java client API.</description>
 	<url>https://github.com/marklogic/java-client-api</url>

src/main/java/com/marklogic/client/impl/JerseyServices.java

@@ -189,6 +189,7 @@ public void verify(String hostname, String[] cns, String[] subjectAlts)
 
 	private DatabaseClient databaseClient;
 	private String database = null;
+	private ThreadSafeClientConnManager connMgr;
 	private ApacheHttpClient4 client;
 	private WebResource connection;
 	private boolean released = false;
@@ -281,6 +282,10 @@ private void connect(String host, int port, String database, String user, String
 
 		if (connection != null)
 			connection = null;
+		if (connMgr != null) {
+			connMgr.shutdown();
+			connMgr = null;
+		}
 		if (client != null) {
 			client.destroy();
 			client = null;
@@ -353,7 +358,7 @@ private void connect(String host, int port, String database, String user, String
 		 *     maxRouteConnections);
 		 */
 		// start 4.1
-		ThreadSafeClientConnManager connMgr = new ThreadSafeClientConnManager(
+		connMgr = new ThreadSafeClientConnManager(
 				schemeRegistry);
 		connMgr.setMaxTotal(maxTotalConnections);
 		connMgr.setDefaultMaxPerRoute(maxRouteConnections);
@@ -470,6 +475,8 @@ public void release() {
 			logger.debug("Releasing connection");
 
 		connection = null;
+		connMgr.shutdown();
+		connMgr = null;
 		client.destroy();
 		client = null;
 	}

test-complete/build.gradle

@@ -26,7 +26,7 @@ jacocoTestReport {
                 }
 
 dependencies {
-	compile('com.marklogic:java-client-api:3.0.5')
+	compile('com.marklogic:java-client-api:3.0.5.1')
 	compile('xmlunit:xmlunit:1.5')
 	compile('junit:junit:4.11')
 	compile('org.skyscreamer:jsonassert:1.2.3')