From 4ea2bc73aa3a298a61532530eb177704fa4a569f Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 11 Jan 2010 14:23:49 +0000
Subject: [PATCH] Fix SDK issue 4421: Remove generic AsynchronousConnection parameter from ConnectionFactory.

---
 opendj-sdk/sdk/src/org/opends/sdk/LoadBalancingConnectionFactory.java |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/opendj-sdk/sdk/src/org/opends/sdk/LoadBalancingConnectionFactory.java b/opendj-sdk/sdk/src/org/opends/sdk/LoadBalancingConnectionFactory.java
index d03a624..5794506 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/LoadBalancingConnectionFactory.java
+++ b/opendj-sdk/sdk/src/org/opends/sdk/LoadBalancingConnectionFactory.java
@@ -1,43 +1,51 @@
 package org.opends.sdk;
 
+
+
 import com.sun.opends.sdk.util.Validator;
 import com.sun.opends.sdk.util.AbstractFutureResult;
 
 import org.opends.sdk.responses.Responses;
 
+
+
 /**
- * Created by IntelliJ IDEA. User: digitalperk Date: Dec 15, 2009 Time: 3:23:52
- * PM To change this template use File | Settings | File Templates.
+ * Created by IntelliJ IDEA. User: digitalperk Date: Dec 15, 2009 Time:
+ * 3:23:52 PM To change this template use File | Settings | File
+ * Templates.
  */
-public class LoadBalancingConnectionFactory
-    extends AbstractConnectionFactory<AsynchronousConnection>
+public class LoadBalancingConnectionFactory extends
+    AbstractConnectionFactory
 {
   private final LoadBalancingAlgorithm algorithm;
 
+
+
   public LoadBalancingConnectionFactory(LoadBalancingAlgorithm algorithm)
   {
     Validator.ensureNotNull(algorithm);
     this.algorithm = algorithm;
   }
 
-  public FutureResult<? extends AsynchronousConnection>
-  getAsynchronousConnection(
-      ResultHandler<? super AsynchronousConnection> resultHandler)
+
+
+  public FutureResult<AsynchronousConnection> getAsynchronousConnection(
+      ResultHandler<AsynchronousConnection> resultHandler)
   {
-    ConnectionFactory<?> factory = algorithm.getNextConnectionFactory();
-    if(factory == null)
+    ConnectionFactory factory = algorithm.getNextConnectionFactory();
+    if (factory == null)
     {
-      AbstractFutureResult<AsynchronousConnection> future =
-          new AbstractFutureResult<AsynchronousConnection>(resultHandler)
+      AbstractFutureResult<AsynchronousConnection> future = new AbstractFutureResult<AsynchronousConnection>(
+          resultHandler)
       {
         public int getRequestID()
         {
           return -1;
         }
       };
-      future.handleErrorResult(new ErrorResultException(
-          Responses.newResult(ResultCode.CLIENT_SIDE_CONNECT_ERROR).
-              setDiagnosticMessage("No connection factories available")));
+      future.handleErrorResult(new ErrorResultException(Responses
+          .newResult(ResultCode.CLIENT_SIDE_CONNECT_ERROR)
+          .setDiagnosticMessage("No connection factories available")));
       return future;
     }
 

--
Gitblit v1.10.0