From 39ee9286999c0faf5e78ab2a68d69d10c7600ff9 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Sun, 26 Aug 2007 00:14:04 +0000
Subject: [PATCH] Update configuration definitions to make a few different types of changes:
---
opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java | 58 ++++------------------------------------------------------
1 files changed, 4 insertions(+), 54 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index 81675be..9fe1fed 100644
--- a/opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -34,7 +34,6 @@
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
-import java.util.SortedSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -146,22 +145,8 @@
// Get the attribute types to use for the searches.
- SortedSet<String> attrNames = currentConfig.getMatchAttribute();
- attributeTypes = new AttributeType[attrNames.size()];
- int i=0;
- for (String name : attrNames)
- {
- AttributeType type = DirectoryServer.getAttributeType(toLowerCase(name),
- false);
- if (type == null)
- {
- Message message = ERR_REGEXMAP_UNKNOWN_ATTR.get(
- String.valueOf(configEntryDN), name);
- throw new ConfigException(message);
- }
-
- attributeTypes[i++] = type;
- }
+ attributeTypes =
+ currentConfig.getMatchAttribute().toArray(new AttributeType[0]);
// Create the attribute list to include in search requests. We want to
@@ -353,21 +338,6 @@
configAcceptable = false;
}
- // Make sure that the set of attribute types is acceptable.
- SortedSet<String> attributeNames = configuration.getMatchAttribute();
- for (String name : attributeNames)
- {
- AttributeType t = DirectoryServer.getAttributeType(toLowerCase(name),
- false);
- if (t == null)
- {
- Message message = ERR_REGEXMAP_UNKNOWN_ATTR.get(
- String.valueOf(configuration.dn()), name);
- unacceptableReasons.add(message);
- configAcceptable = false;
- }
- }
-
return configAcceptable;
}
@@ -406,28 +376,8 @@
}
- // Get the attribute types to use for the searches.
- SortedSet<String> attrNames = configuration.getMatchAttribute();
- AttributeType[] newAttributeTypes = new AttributeType[attrNames.size()];
- int i=0;
- for (String name : attrNames)
- {
- AttributeType type = DirectoryServer.getAttributeType(toLowerCase(name),
- false);
- if (type == null)
- {
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = ResultCode.NO_SUCH_ATTRIBUTE;
- }
-
- Message message = ERR_REGEXMAP_UNKNOWN_ATTR.get(
- String.valueOf(configEntryDN), name);
- messages.add(message);
- }
-
- newAttributeTypes[i++] = type;
- }
+ AttributeType[] newAttributeTypes =
+ configuration.getMatchAttribute().toArray(new AttributeType[0]);
if (resultCode == ResultCode.SUCCESS)
--
Gitblit v1.10.0