From 72650d4cc41c64136d064967d7fec3726d850fee Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 14 Oct 2010 11:52:28 +0000
Subject: [PATCH] Multiple enhancements and bug fixes to the SDK (update from OpenDS by matthew_swift):
---
sdk/src/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/sdk/src/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java b/sdk/src/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java
index 0cc8329..4881524 100644
--- a/sdk/src/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java
+++ b/sdk/src/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2009 Sun Microsystems, Inc.
+ * Copyright 2009-2010 Sun Microsystems, Inc.
*/
package com.sun.opends.sdk.ldap;
@@ -34,7 +34,7 @@
import org.opends.sdk.responses.IntermediateResponse;
import org.opends.sdk.responses.Result;
-import com.sun.opends.sdk.util.AbstractFutureResult;
+import com.sun.opends.sdk.util.AsynchronousFutureResult;
@@ -45,12 +45,11 @@
* The type of result returned by this future.
*/
abstract class AbstractLDAPFutureResultImpl<S extends Result> extends
- AbstractFutureResult<S> implements FutureResult<S>,
- IntermediateResponseHandler
+ AsynchronousFutureResult<S> implements IntermediateResponseHandler
{
private final AsynchronousConnection connection;
- private final int messageID;
+ private final int requestID;
private IntermediateResponseHandler intermediateResponseHandler;
@@ -58,13 +57,13 @@
- AbstractLDAPFutureResultImpl(final int messageID,
+ AbstractLDAPFutureResultImpl(final int requestID,
final ResultHandler<? super S> resultHandler,
final IntermediateResponseHandler intermediateResponseHandler,
final AsynchronousConnection connection)
{
super(resultHandler);
- this.messageID = messageID;
+ this.requestID = requestID;
this.connection = connection;
this.intermediateResponseHandler = intermediateResponseHandler;
this.timestamp = System.currentTimeMillis();
@@ -75,13 +74,15 @@
/**
* {@inheritDoc}
*/
+ @Override
public final int getRequestID()
{
- return messageID;
+ return requestID;
}
+ @Override
public final boolean handleIntermediateResponse(
final IntermediateResponse response)
{
@@ -112,7 +113,7 @@
protected final ErrorResultException handleCancelRequest(
final boolean mayInterruptIfRunning)
{
- connection.abandon(Requests.newAbandonRequest(messageID));
+ connection.abandon(Requests.newAbandonRequest(requestID));
return null;
}
@@ -121,8 +122,8 @@
@Override
protected void toString(final StringBuilder sb)
{
- sb.append(" messageID = ");
- sb.append(messageID);
+ sb.append(" requestID = ");
+ sb.append(requestID);
sb.append(" timestamp = ");
sb.append(timestamp);
super.toString(sb);
@@ -132,8 +133,8 @@
final void adaptErrorResult(final Result result)
{
- final S errorResult = newErrorResult(result.getResultCode(), result
- .getDiagnosticMessage(), result.getCause());
+ final S errorResult = newErrorResult(result.getResultCode(),
+ result.getDiagnosticMessage(), result.getCause());
setResultOrError(errorResult);
}
--
Gitblit v1.10.0