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/BooleanConfigAttribute.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java b/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
index 052a7e8..a1dc506 100644
--- a/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
+++ b/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
@@ -40,9 +40,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.AttributeValues;
+import org.opends.server.types.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.messages.ConfigMessages.*;
@@ -241,13 +242,15 @@
new LinkedHashSet<AttributeValue>(1);
if (booleanValue)
{
- valueSet.add(new AttributeValue(new ASN1OctetString(CONFIG_VALUE_TRUE),
- new ASN1OctetString(CONFIG_VALUE_TRUE)));
+ valueSet.add(AttributeValues.create(
+ ByteString.valueOf(CONFIG_VALUE_TRUE),
+ ByteString.valueOf(CONFIG_VALUE_TRUE)));
}
else
{
- valueSet.add(new AttributeValue(new ASN1OctetString(CONFIG_VALUE_FALSE),
- new ASN1OctetString(CONFIG_VALUE_FALSE)));
+ valueSet.add(AttributeValues.create(
+ ByteString.valueOf(CONFIG_VALUE_FALSE),
+ ByteString.valueOf(CONFIG_VALUE_FALSE)));
}
return valueSet;
@@ -288,7 +291,7 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
- String stringValue = value.getStringValue();
+ String stringValue = value.getValue().toString();
if (stringValue.equalsIgnoreCase(CONFIG_VALUE_TRUE) ||
stringValue.equalsIgnoreCase(CONFIG_VALUE_FALSE))
{
@@ -464,7 +467,8 @@
{
// Get the value and parse it as a Boolean.
Iterator<AttributeValue> iterator = a.iterator();
- String valueString = iterator.next().getStringValue().toLowerCase();
+ String valueString =
+ iterator.next().getValue().toString().toLowerCase();
if (valueString.equals("true") || valueString.equals("yes") ||
valueString.equals("on") || valueString.equals("1"))
@@ -526,7 +530,8 @@
{
// Get the value and parse it as a Boolean.
Iterator<AttributeValue> iterator = a.iterator();
- String valueString = iterator.next().getStringValue().toLowerCase();
+ String valueString =
+ iterator.next().getValue().toString().toLowerCase();
if (valueString.equals("true") || valueString.equals("yes") ||
valueString.equals("on") || valueString.equals("1"))
--
Gitblit v1.10.0