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/InternalConnectionFactory.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java
index ceaac3c..f5cb757 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.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;
@@ -50,9 +50,7 @@
* The type of client context.
*/
final class InternalConnectionFactory<C> implements ConnectionFactory {
-
private final ServerConnectionFactory<C, Integer> factory;
-
private final C clientContext;
InternalConnectionFactory(final ServerConnectionFactory<C, Integer> factory,
@@ -61,17 +59,16 @@
this.clientContext = clientContext;
}
- /**
- * {@inheritDoc}
- */
+ @Override
+ public void close() {
+ // Nothing to do.
+ }
+
public Connection getConnection() throws ErrorResultException {
final ServerConnection<Integer> serverConnection = factory.handleAccept(clientContext);
return new InternalConnection(serverConnection);
}
- /**
- * {@inheritDoc}
- */
public FutureResult<Connection> getConnectionAsync(
final ResultHandler<? super Connection> handler) {
final ServerConnection<Integer> serverConnection;
@@ -91,9 +88,6 @@
return new CompletedFutureResult<Connection>(connection);
}
- /**
- * {@inheritDoc}
- */
public String toString() {
final StringBuilder builder = new StringBuilder();
builder.append("InternalConnectionFactory(");
--
Gitblit v1.10.0