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/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java b/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java
index 9ba5157..a46aabe 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package com.forgerock.opendj.ldap;
@@ -47,7 +48,7 @@
abstract class AbstractLDAPFutureResultImpl<S extends Result> extends
AsynchronousFutureResult<S> implements IntermediateResponseHandler
{
- private final AsynchronousConnection connection;
+ private final Connection connection;
private final int requestID;
@@ -60,7 +61,7 @@
AbstractLDAPFutureResultImpl(final int requestID,
final ResultHandler<? super S> resultHandler,
final IntermediateResponseHandler intermediateResponseHandler,
- final AsynchronousConnection connection)
+ final Connection connection)
{
super(resultHandler);
this.requestID = requestID;
@@ -113,7 +114,7 @@
protected final ErrorResultException handleCancelRequest(
final boolean mayInterruptIfRunning)
{
- connection.abandon(Requests.newAbandonRequest(requestID));
+ connection.abandonAsync(Requests.newAbandonRequest(requestID));
return null;
}
--
Gitblit v1.10.0