From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk

---
 opends/src/server/org/opends/server/core/ExtendedOperationBasis.java |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/ExtendedOperationBasis.java b/opends/src/server/org/opends/server/core/ExtendedOperationBasis.java
index 195ee47..527f19a 100644
--- a/opends/src/server/org/opends/server/core/ExtendedOperationBasis.java
+++ b/opends/src/server/org/opends/server/core/ExtendedOperationBasis.java
@@ -35,7 +35,6 @@
 import org.opends.server.api.ClientConnection;
 import org.opends.server.api.ExtendedOperationHandler;
 import org.opends.server.api.plugin.PluginResult;
-import org.opends.server.protocols.asn1.ASN1OctetString;
 import org.opends.server.types.operation.PostOperationExtendedOperation;
 import org.opends.server.types.operation.PostResponseExtendedOperation;
 import org.opends.server.types.operation.PreOperationExtendedOperation;
@@ -71,10 +70,10 @@
   private static final DebugTracer TRACER = DebugLogger.getTracer();
 
   // The value for the request associated with this extended operation.
-  private ASN1OctetString requestValue;
+  private ByteString requestValue;
 
   // The value for the response associated with this extended operation.
-  private ASN1OctetString responseValue;
+  private ByteString responseValue;
 
   // Indicates whether a response has yet been sent for this operation.
   private boolean responseSent;
@@ -107,7 +106,7 @@
   public ExtendedOperationBasis(ClientConnection clientConnection,
                            long operationID,
                            int messageID, List<Control> requestControls,
-                           String requestOID, ASN1OctetString requestValue)
+                           String requestOID, ByteString requestValue)
   {
     super(clientConnection, operationID, messageID, requestControls);
 
@@ -162,7 +161,7 @@
   /**
    * {@inheritDoc}
    */
-  public final ASN1OctetString getRequestValue()
+  public final ByteString getRequestValue()
   {
     return requestValue;
   }
@@ -176,7 +175,7 @@
    * @param  requestValue  The value for the request associated with this
    *                       extended operation.
    */
-  public final void setRequestValue(ASN1OctetString requestValue)
+  public final void setRequestValue(ByteString requestValue)
   {
     this.requestValue = requestValue;
   }
@@ -206,7 +205,7 @@
   /**
    * {@inheritDoc}
    */
-  public final ASN1OctetString getResponseValue()
+  public final ByteString getResponseValue()
   {
     return responseValue;
   }
@@ -216,7 +215,7 @@
   /**
    * {@inheritDoc}
    */
-  public final void setResponseValue(ASN1OctetString responseValue)
+  public final void setResponseValue(ByteString responseValue)
   {
     this.responseValue = responseValue;
   }
@@ -469,10 +468,10 @@
             pluginConfigManager.invokePreOperationExtendedPlugins(this);
         if(!preOpResult.continueProcessing())
         {
-          setResultCode(preParseResult.getResultCode());
-          appendErrorMessage(preParseResult.getErrorMessage());
-          setMatchedDN(preParseResult.getMatchedDN());
-          setReferralURLs(preParseResult.getReferralURLs());
+          setResultCode(preOpResult.getResultCode());
+          appendErrorMessage(preOpResult.getErrorMessage());
+          setMatchedDN(preOpResult.getMatchedDN());
+          setReferralURLs(preOpResult.getReferralURLs());
           return;
         }
 

--
Gitblit v1.10.0