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/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
index 5a58f20..433a59f 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
@@ -33,11 +33,11 @@
import org.opends.messages.Message;
import org.opends.server.tools.LDAPConnection;
import org.opends.server.protocols.asn1.ASN1Exception;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ModifyDNRequestProtocolOp;
import org.opends.server.protocols.ldap.ModifyDNResponseProtocolOp;
import org.opends.server.protocols.ldap.ProtocolOp;
+import org.opends.server.types.ByteString;
import org.opends.server.types.LDAPException;
@@ -84,22 +84,21 @@
{
LDAPResult modDNResponse = objFactory.createLDAPResult();
modDNResponse.setRequestID(modifyDNRequest.getRequestID());
-
- ASN1OctetString dnStr = new ASN1OctetString(modifyDNRequest.getDn());
-
+ ByteString dnStr = ByteString.valueOf(modifyDNRequest.getDn());
ProtocolOp op = null;
- if(modifyDNRequest.getNewSuperior() != null)
+ if (modifyDNRequest.getNewSuperior() != null)
{
- op = new ModifyDNRequestProtocolOp(dnStr,
- new ASN1OctetString(modifyDNRequest.getNewrdn()),
- modifyDNRequest.isDeleteoldrdn(),
- new ASN1OctetString(modifyDNRequest.getNewSuperior()));
- } else
+ op = new ModifyDNRequestProtocolOp(dnStr, ByteString
+ .valueOf(modifyDNRequest.getNewrdn()), modifyDNRequest
+ .isDeleteoldrdn(), ByteString.valueOf(modifyDNRequest
+ .getNewSuperior()));
+ }
+ else
{
- op = new ModifyDNRequestProtocolOp(dnStr,
- new ASN1OctetString(modifyDNRequest.getNewrdn()),
- modifyDNRequest.isDeleteoldrdn());
+ op = new ModifyDNRequestProtocolOp(dnStr, ByteString
+ .valueOf(modifyDNRequest.getNewrdn()), modifyDNRequest
+ .isDeleteoldrdn());
}
// Create and send the LDAP request to the server.
--
Gitblit v1.10.0