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/org/opends/sdk/responses/GenericIntermediateResponseImpl.java |   61 +++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java b/sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
index 6f6e2a1..7cc9838 100644
--- a/sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
+++ b/sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
@@ -15,14 +15,14 @@
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at
  * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * generic extended the following below this CDDL HEADER, with the fields enclosed
+ * add the following below this CDDL HEADER, with the fields enclosed
  * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Copyright 2009 Sun Microsystems, Inc.
+ *      Copyright 2010 Sun Microsystems, Inc.
  */
 
 package org.opends.sdk.responses;
@@ -31,6 +31,8 @@
 
 import org.opends.sdk.ByteString;
 
+import com.sun.opends.sdk.util.StaticUtils;
+
 
 
 /**
@@ -48,20 +50,20 @@
 
 
   /**
-   * Creates a new generic intermediate response using the provided
-   * response name and value.
-   * 
+   * Creates a new generic intermediate response using the provided response
+   * name and value.
+   *
    * @param responseName
-   *          The dotted-decimal representation of the unique OID
-   *          corresponding to this intermediate response, which may be
-   *          {@code null} indicating that none was provided.
-   * @param responseValue
-   *          The response value associated with this generic
-   *          intermediate response, which may be {@code null}
+   *          The dotted-decimal representation of the unique OID corresponding
+   *          to this intermediate response, which may be {@code null}
    *          indicating that none was provided.
+   * @param responseValue
+   *          The response value associated with this generic intermediate
+   *          response, which may be {@code null} indicating that none was
+   *          provided.
    */
-  GenericIntermediateResponseImpl(String responseName,
-      ByteString responseValue)
+  GenericIntermediateResponseImpl(final String responseName,
+      final ByteString responseValue)
   {
     this.responseName = responseName;
     this.responseValue = responseValue;
@@ -72,7 +74,8 @@
   /**
    * {@inheritDoc}
    */
-  public String getResponseName()
+  @Override
+  public String getOID()
   {
     return responseName;
   }
@@ -82,7 +85,8 @@
   /**
    * {@inheritDoc}
    */
-  public ByteString getResponseValue()
+  @Override
+  public ByteString getValue()
   {
     return responseValue;
   }
@@ -92,7 +96,18 @@
   /**
    * {@inheritDoc}
    */
-  public GenericIntermediateResponse setResponseName(String oid)
+  @Override
+  public boolean hasValue()
+  {
+    return responseValue != null;
+  }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  public GenericIntermediateResponse setOID(final String oid)
       throws UnsupportedOperationException
   {
     this.responseName = oid;
@@ -104,7 +119,7 @@
   /**
    * {@inheritDoc}
    */
-  public GenericIntermediateResponse setResponseValue(ByteString bytes)
+  public GenericIntermediateResponse setValue(final ByteString bytes)
       throws UnsupportedOperationException
   {
     this.responseValue = bytes;
@@ -120,11 +135,13 @@
   public String toString()
   {
     final StringBuilder builder = new StringBuilder();
-    builder.append("IntermediateResponse(responseName=");
-    builder.append(getResponseName() == null ? "" : getResponseName());
-    builder.append(", responseValue=");
-    final ByteString value = getResponseValue();
-    builder.append(value == null ? ByteString.empty() : value);
+    builder.append("GenericIntermediateResponse(responseName=");
+    builder.append(getOID() == null ? "" : getOID());
+    if (hasValue())
+    {
+      builder.append(", requestValue=");
+      StaticUtils.toHexPlusAscii(getValue(), builder, 4);
+    }
     builder.append(", controls=");
     builder.append(getControls());
     builder.append(")");

--
Gitblit v1.10.0