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/config/ReadOnlyConfigAttribute.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java b/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
index 9057570..6fa9e54 100644
--- a/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
+++ b/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
@@ -38,9 +38,10 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.AttributeValues;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.messages.ConfigMessages.*;
@@ -280,8 +281,8 @@
LinkedHashSet<AttributeValue> valueSet =
new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(new ASN1OctetString(value),
- new ASN1OctetString(value)));
+ valueSet.add(AttributeValues.create(ByteString.valueOf(value),
+ ByteString.valueOf(value)));
return valueSet;
}
@@ -307,8 +308,8 @@
for (String value : values)
{
- valueSet.add(new AttributeValue(new ASN1OctetString(value),
- new ASN1OctetString(value)));
+ valueSet.add(AttributeValues.create(ByteString.valueOf(value),
+ ByteString.valueOf(value)));
}
return valueSet;
@@ -383,8 +384,8 @@
new LinkedHashSet<AttributeValue>(numValues);
for (String valueString : valueStrings)
{
- valueSet.add(new AttributeValue(new ASN1OctetString(valueString),
- new ASN1OctetString(valueString)));
+ valueSet.add(AttributeValues.create(ByteString.valueOf(valueString),
+ ByteString.valueOf(valueString)));
}
--
Gitblit v1.10.0