From 3f7ddbf313aaabbfba4650cb2036cb41e51a9bde Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 18 Apr 2013 11:37:28 +0000
Subject: [PATCH] Fix OPENDJ-838: Add ConnectionFactory.close() method to facilitate resource cleanup after application exit
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java
index 2b59286..9c0143d 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap;
@@ -37,28 +37,22 @@
final class LoadBalancer implements ConnectionFactory {
private final LoadBalancingAlgorithm algorithm;
- /**
- * Creates a new load balancer using the provided algorithm.
- *
- * @param algorithm
- * The load balancing algorithm which will be used to obtain the
- * next connection factory.
- */
- public LoadBalancer(final LoadBalancingAlgorithm algorithm) {
+ LoadBalancer(final LoadBalancingAlgorithm algorithm) {
Validator.ensureNotNull(algorithm);
this.algorithm = algorithm;
}
- /**
- * {@inheritDoc}
- */
+ @Override
+ public void close() {
+ // Delegate to the algorithm.
+ algorithm.close();
+ }
+
+ @Override
public Connection getConnection() throws ErrorResultException {
return algorithm.getConnectionFactory().getConnection();
}
- /**
- * {@inheritDoc}
- */
@Override
public FutureResult<Connection> getConnectionAsync(
final ResultHandler<? super Connection> resultHandler) {
@@ -76,9 +70,7 @@
return factory.getConnectionAsync(resultHandler);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public String toString() {
final StringBuilder builder = new StringBuilder();
builder.append("LoadBalancer(");
--
Gitblit v1.10.0