Bug:26342 keep reference to client in services to prevent garbage collection

git-svn-id: svn+ssh://svn.marklogic.com/project/engsvn/client-api/java/branches/b1_0@164545 62cac252-8da6-4816-9e9d-6dc37b19578c

Author: ehennum

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

@@ -41,6 +41,7 @@ public class DatabaseClientImpl implements DatabaseClient {
 
 	public DatabaseClientImpl(RESTServices services) {
 		this.services = services;
+		services.setDatabaseClient(this);
 	}
 
 	@Override

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

@@ -53,6 +53,7 @@
 
 import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.DatabaseClientFactory.SSLHostnameVerifier;
+import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.FailedRequestException;
 import com.marklogic.client.ForbiddenUserException;
 import com.marklogic.client.MarkLogicInternalException;
@@ -120,6 +121,7 @@ public void verify(String hostname, String[] cns, String[] subjectAlts)
 		}
 	}
 
+	private DatabaseClient databaseClient;
 	private ApacheHttpClient4 client;
 	private WebResource connection;
 
@@ -317,8 +319,21 @@ else if (authenType == Authentication.DIGEST)
 		connection = client.resource(baseUri);
 	}
 
+	@Override
+	public DatabaseClient getDatabaseClient() {
+		return databaseClient;
+	}
+	@Override
+	public void setDatabaseClient(DatabaseClient client) {
+		this.databaseClient = client;
+	}
+
 	@Override
 	public void release() {
+		if (databaseClient != null) {
+			databaseClient = null;
+		}
+
 		if (client == null)
 			return;
 

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

@@ -19,6 +19,7 @@
 
 import javax.net.ssl.SSLContext;
 
+import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.DatabaseClientFactory.SSLHostnameVerifier;
 import com.marklogic.client.FailedRequestException;
@@ -44,6 +45,8 @@
 public interface RESTServices {
 	public void connect(String host, int port, String user, String password, Authentication type,
 			SSLContext context, SSLHostnameVerifier verifier);
+	public DatabaseClient getDatabaseClient();
+	public void setDatabaseClient(DatabaseClient client);
 	public void release();
 
 	public void deleteDocument(RequestLogger logger, DocumentDescriptor desc, String transactionId,