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/AddOperationBasis.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/AddOperationBasis.java b/opends/src/server/org/opends/server/core/AddOperationBasis.java
index 7280815..0667056 100644
--- a/opends/src/server/org/opends/server/core/AddOperationBasis.java
+++ b/opends/src/server/org/opends/server/core/AddOperationBasis.java
@@ -52,7 +52,6 @@
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.types.*;
import org.opends.server.types.operation.PostResponseAddOperation;
@@ -175,14 +174,14 @@
this.userAttributes = userAttributes;
this.operationalAttributes = operationalAttributes;
- rawEntryDN = new ASN1OctetString(entryDN.toString());
+ rawEntryDN = ByteString.valueOf(entryDN.toString());
rawAttributes = new ArrayList<RawAttribute>();
- ArrayList<ASN1OctetString> ocValues = new ArrayList<ASN1OctetString>();
+ ArrayList<ByteString> ocValues = new ArrayList<ByteString>();
for (String s : objectClasses.values())
{
- ocValues.add(new ASN1OctetString(s));
+ ocValues.add(ByteString.valueOf(s));
}
LDAPAttribute ocAttr = new LDAPAttribute(ATTR_OBJECTCLASS, ocValues);
--
Gitblit v1.10.0