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/ModifyDNOperationBasis.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/ModifyDNOperationBasis.java b/opends/src/server/org/opends/server/core/ModifyDNOperationBasis.java
index 65db06b..ca97939 100644
--- a/opends/src/server/org/opends/server/core/ModifyDNOperationBasis.java
+++ b/opends/src/server/org/opends/server/core/ModifyDNOperationBasis.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.core;
import org.opends.messages.MessageBuilder;
@@ -33,7 +33,6 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.networkgroups.NetworkGroup;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.operation.PostResponseModifyDNOperation;
import org.opends.server.types.operation.PreParseModifyDNOperation;
import static org.opends.server.core.CoreConstants.*;
@@ -176,8 +175,8 @@
this.deleteOldRDN = deleteOldRDN;
this.newSuperior = newSuperior;
- rawEntryDN = new ASN1OctetString(entryDN.toString());
- rawNewRDN = new ASN1OctetString(newRDN.toString());
+ rawEntryDN = ByteString.valueOf(entryDN.toString());
+ rawNewRDN = ByteString.valueOf(newRDN.toString());
if (newSuperior == null)
{
@@ -185,7 +184,7 @@
}
else
{
- rawNewSuperior = new ASN1OctetString(newSuperior.toString());
+ rawNewSuperior = ByteString.valueOf(newSuperior.toString());
}
responseControls = new ArrayList<Control>();
@@ -270,7 +269,7 @@
{
if (newRDN == null)
{
- newRDN = RDN.decode(rawNewRDN.stringValue());
+ newRDN = RDN.decode(rawNewRDN.toString());
}
}
catch (DirectoryException de)
@@ -444,7 +443,7 @@
}
else
{
- newSuperiorStr = rawNewSuperior.stringValue();
+ newSuperiorStr = rawNewSuperior.toString();
}
return new String[][]
@@ -572,6 +571,7 @@
* managing synchronization, and any other work that might need to
* be done in the course of processing.
*/
+ @Override
public final void run()
{
setResultCode(ResultCode.UNDEFINED);
--
Gitblit v1.10.0