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/AbstractLoadBalancingAlgorithm.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/AbstractLoadBalancingAlgorithm.java b/opendj-sdk/sdk/src/org/opends/sdk/AbstractLoadBalancingAlgorithm.java
index b5233a1..099d4db 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/AbstractLoadBalancingAlgorithm.java
+++ b/opendj-sdk/sdk/src/org/opends/sdk/AbstractLoadBalancingAlgorithm.java
@@ -51,12 +51,12 @@
protected AbstractLoadBalancingAlgorithm(
- ConnectionFactory<?>... factories)
+ ConnectionFactory... factories)
{
Validator.ensureNotNull((Object[]) factories);
factoryList = new ArrayList<MonitoredConnectionFactory>(
factories.length);
- for (ConnectionFactory<?> f : factories)
+ for (ConnectionFactory f : factories)
{
factoryList.add(new MonitoredConnectionFactory(f));
}
@@ -67,10 +67,10 @@
protected class MonitoredConnectionFactory extends
- AbstractConnectionFactory<AsynchronousConnection> implements
+ AbstractConnectionFactory implements
ResultHandler<AsynchronousConnection>
{
- private final ConnectionFactory<?> factory;
+ private final ConnectionFactory factory;
private volatile boolean isOperational;
@@ -78,7 +78,7 @@
- private MonitoredConnectionFactory(ConnectionFactory<?> factory)
+ private MonitoredConnectionFactory(ConnectionFactory factory)
{
this.factory = factory;
this.isOperational = true;
@@ -109,8 +109,8 @@
- public FutureResult<? extends AsynchronousConnection> getAsynchronousConnection(
- final ResultHandler<? super AsynchronousConnection> resultHandler)
+ public FutureResult<AsynchronousConnection> getAsynchronousConnection(
+ final ResultHandler<AsynchronousConnection> resultHandler)
{
ResultHandler<AsynchronousConnection> handler = new ResultHandler<AsynchronousConnection>()
{
--
Gitblit v1.10.0