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/org/opends/sdk/requests/CancelExtendedRequestImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/sdk/src/org/opends/sdk/requests/CancelExtendedRequestImpl.java b/sdk/src/org/opends/sdk/requests/CancelExtendedRequestImpl.java
index 627fa69..51e89f2 100644
--- a/sdk/src/org/opends/sdk/requests/CancelExtendedRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/CancelExtendedRequestImpl.java
@@ -40,6 +40,7 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.controls.Control;
+import org.opends.sdk.responses.AbstractExtendedResultDecoder;
import org.opends.sdk.responses.ExtendedResult;
import org.opends.sdk.responses.ExtendedResultDecoder;
import org.opends.sdk.responses.Responses;
@@ -94,10 +95,10 @@
- private static final class ResultDecoder implements
- ExtendedResultDecoder<ExtendedResult>
+ private static final class ResultDecoder extends
+ AbstractExtendedResultDecoder<ExtendedResult>
{
- public ExtendedResult adaptExtendedErrorResult(final ResultCode resultCode,
+ public ExtendedResult newExtendedErrorResult(final ResultCode resultCode,
final String matchedDN, final String diagnosticMessage)
{
return Responses.newGenericExtendedResult(resultCode).setMatchedDN(
@@ -116,7 +117,7 @@
- private int messageID;
+ private int requestID;
// No need to expose this.
private static final ExtendedResultDecoder<ExtendedResult> RESULT_DECODER = new ResultDecoder();
@@ -124,9 +125,9 @@
// Instantiation via factory.
- CancelExtendedRequestImpl(final int messageID)
+ CancelExtendedRequestImpl(final int requestID)
{
- this.messageID = messageID;
+ this.requestID = requestID;
}
@@ -134,9 +135,9 @@
/**
* {@inheritDoc}
*/
- public int getMessageID()
+ public int getRequestID()
{
- return messageID;
+ return requestID;
}
@@ -175,7 +176,7 @@
try
{
writer.writeStartSequence();
- writer.writeInteger(messageID);
+ writer.writeInteger(requestID);
writer.writeEndSequence();
}
catch (final IOException ioe)
@@ -203,9 +204,9 @@
/**
* {@inheritDoc}
*/
- public CancelExtendedRequest setMessageID(final int id)
+ public CancelExtendedRequest setRequestID(final int id)
{
- this.messageID = id;
+ this.requestID = id;
return this;
}
@@ -220,8 +221,8 @@
final StringBuilder builder = new StringBuilder();
builder.append("CancelExtendedRequest(requestName=");
builder.append(getOID());
- builder.append(", messageID=");
- builder.append(messageID);
+ builder.append(", requestID=");
+ builder.append(requestID);
builder.append(", controls=");
builder.append(getControls());
builder.append(")");
--
Gitblit v1.10.0