From f2160f4bd1c8ac67e5a86a6710d431e8932877f9 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 28 May 2010 11:47:51 +0000
Subject: [PATCH] Synchronize SDK on java.net with internal repository.

---
 sdk/src/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/sdk/src/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java b/sdk/src/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java
index db0454b..50a786d 100644
--- a/sdk/src/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java
+++ b/sdk/src/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java
@@ -31,47 +31,53 @@
 
 import org.opends.sdk.*;
 import org.opends.sdk.requests.ExtendedRequest;
-import org.opends.sdk.responses.Result;
+import org.opends.sdk.responses.ExtendedResult;
 
 
 
 /**
  * Extended result future implementation.
+ *
+ * @param <R>
+ *          The type of result returned by this future.
  */
-final class LDAPExtendedFutureResultImpl<R extends Result> extends
+final class LDAPExtendedFutureResultImpl<R extends ExtendedResult> extends
     AbstractLDAPFutureResultImpl<R> implements FutureResult<R>
 {
   private final ExtendedRequest<R> request;
 
 
 
-  LDAPExtendedFutureResultImpl(int messageID, ExtendedRequest<R> request,
-      ResultHandler<? super R> handler, LDAPConnection connection)
+  LDAPExtendedFutureResultImpl(final int messageID,
+      final ExtendedRequest<R> request,
+      final ResultHandler<? super R> resultHandler,
+      final IntermediateResponseHandler intermediateResponseHandler,
+      final AsynchronousConnection connection)
   {
-    super(messageID, handler, connection);
+    super(messageID, resultHandler, intermediateResponseHandler, connection);
     this.request = request;
   }
 
 
 
-  R decodeResponse(ResultCode resultCode, String matchedDN,
-      String diagnosticMessage, String responseName,
-      ByteString responseValue) throws DecodeException
+  @Override
+  public String toString()
   {
-    return request.getExtendedOperation().decodeResponse(resultCode,
-        matchedDN, diagnosticMessage, responseName, responseValue);
+    final StringBuilder sb = new StringBuilder();
+    sb.append("LDAPExtendedFutureResultImpl(");
+    sb.append("request = ");
+    sb.append(request);
+    super.toString(sb);
+    sb.append(")");
+    return sb.toString();
   }
 
 
 
-  /**
-   * {@inheritDoc}
-   */
-  R newErrorResult(ResultCode resultCode, String diagnosticMessage,
-      Throwable cause)
+  R decodeResult(final ExtendedResult result, final DecodeOptions options)
+      throws DecodeException
   {
-    return request.getExtendedOperation().decodeResponse(resultCode,
-        "", diagnosticMessage);
+    return request.getResultDecoder().decodeExtendedResult(result, options);
   }
 
 
@@ -80,4 +86,17 @@
   {
     return request;
   }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  R newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
+      final Throwable cause)
+  {
+    return request.getResultDecoder().adaptExtendedErrorResult(resultCode, "",
+        diagnosticMessage);
+  }
 }

--
Gitblit v1.10.0