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/extensions/UserDefinedVirtualAttributeProvider.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java b/opends/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
index f893cd7..61a2686 100644
--- a/opends/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
+++ b/opends/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
@@ -39,14 +39,7 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.Entry;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
-import org.opends.server.types.VirtualAttributeRule;
-
+import org.opends.server.types.*;
/**
@@ -130,19 +123,21 @@
{
AttributeType attributeType = rule.getAttributeType();
Set<String> userDefinedValues = currentConfig.getValue();
+
switch (userDefinedValues.size()) {
case 0:
return Collections.emptySet();
case 1:
String valueString = userDefinedValues.iterator().next();
- AttributeValue value = new AttributeValue(attributeType, valueString);
+ AttributeValue value =
+ AttributeValues.create(attributeType, valueString);
return Collections.singleton(value);
default:
HashSet<AttributeValue> values =
new HashSet<AttributeValue>(userDefinedValues.size());
for (String valueString2 : userDefinedValues)
{
- values.add(new AttributeValue(attributeType, valueString2));
+ values.add(AttributeValues.create(attributeType, valueString2));
}
return Collections.unmodifiableSet(values);
}
--
Gitblit v1.10.0