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/AbstractConnectionFactory.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/AbstractConnectionFactory.java b/opendj-sdk/sdk/src/org/opends/sdk/AbstractConnectionFactory.java
index a5de76f..6fa60c4 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/AbstractConnectionFactory.java
+++ b/opendj-sdk/sdk/src/org/opends/sdk/AbstractConnectionFactory.java
@@ -38,13 +38,9 @@
* This class provides a skeletal implementation of the {@code
* ConnectionFactory} interface, to minimize the effort required to
* implement this interface.
- *
- * @param <C>
- * The type of asynchronous connection returned by this
- * connection factory.
*/
-public abstract class AbstractConnectionFactory<C extends AsynchronousConnection>
- implements ConnectionFactory<C>
+public abstract class AbstractConnectionFactory implements
+ ConnectionFactory
{
/**
* Creates a new abstract connection factory.
@@ -59,8 +55,8 @@
/**
* {@inheritDoc}
*/
- public abstract FutureResult<? extends C> getAsynchronousConnection(
- ResultHandler<? super C> handler);
+ public abstract FutureResult<AsynchronousConnection> getAsynchronousConnection(
+ ResultHandler<AsynchronousConnection> handler);
@@ -101,10 +97,10 @@
* @throws ErrorResultException
* If the connection request failed for some reason.
*/
- protected final C blockingGetAsynchronousConnection()
+ protected final AsynchronousConnection blockingGetAsynchronousConnection()
throws ErrorResultException
{
- FutureResult<? extends C> future = getAsynchronousConnection(null);
+ FutureResult<AsynchronousConnection> future = getAsynchronousConnection(null);
try
{
return future.get();
--
Gitblit v1.10.0