From 32034d853f3a284424ccfa87b6de210f1ca814e1 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 29 Nov 2011 00:31:21 +0000
Subject: [PATCH] Fix OPENDJ-43 (Synchronous Connection decorator implementations should not use AsynchronousConnections) and OPENDJ-328 (Make it easier to implement connection decorators).

---
 opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java
index ac686e4..b11862c 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java
@@ -64,11 +64,11 @@
 
 
   /**
-   * Obtains an asynchronous connection from this connection pool, potentially
+   * Asynchronously obtains a connection from this connection pool, potentially
    * opening a new connection if needed.
    * <p>
    * The returned {@code FutureResult} can be used to retrieve the pooled
-   * asynchronous connection. Alternatively, if a {@code ResultHandler} is
+   * connection. Alternatively, if a {@code ResultHandler} is
    * provided, the handler will be notified when the pooled connection is
    * available and ready for use.
    * <p>
@@ -78,13 +78,12 @@
    * @param handler
    *          The completion handler, or {@code null} if no handler is to be
    *          used.
-   * @return A future which can be used to retrieve the pooled asynchronous
-   *         connection.
+   * @return A future which can be used to retrieve the pooled connection.
    * @throws IllegalStateException
    *           If this connection pool has already been closed.
    */
-  FutureResult<AsynchronousConnection> getAsynchronousConnection(
-      ResultHandler<? super AsynchronousConnection> handler);
+  FutureResult<Connection> getConnectionAsync(
+      ResultHandler<? super Connection> handler);
 
 
 

--
Gitblit v1.10.0