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/DSMLAddOperation.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java
index bd69f7b..0f1e8ca 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java
@@ -32,13 +32,13 @@
import org.opends.messages.Message;
import org.opends.server.protocols.asn1.ASN1Exception;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.ldap.AddRequestProtocolOp;
import org.opends.server.protocols.ldap.AddResponseProtocolOp;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.tools.LDAPConnection;
+import org.opends.server.types.ByteString;
import org.opends.server.types.LDAPException;
import org.opends.server.types.RawAttribute;
@@ -86,17 +86,17 @@
LDAPResult addResponse = objFactory.createLDAPResult();
addResponse.setRequestID(addRequest.getRequestID());
- ASN1OctetString dnStr = new ASN1OctetString(addRequest.getDn());
+ ByteString dnStr = ByteString.valueOf(addRequest.getDn());
ArrayList<RawAttribute> attributes = new ArrayList<RawAttribute>();
List<DsmlAttr> addList = addRequest.getAttr();
for(DsmlAttr attr : addList)
{
- ArrayList<ASN1OctetString> values = new ArrayList<ASN1OctetString>();
+ ArrayList<ByteString> values = new ArrayList<ByteString>();
List<String> vals = attr.getValue();
for(String val : vals)
{
- values.add(new ASN1OctetString(val));
+ values.add(ByteString.valueOf(val));
}
LDAPAttribute ldapAttribute = new LDAPAttribute(attr.getName(), values);
attributes.add(ldapAttribute);
--
Gitblit v1.10.0