From 2f8d8f79932fc7ace3098a3a32fc71a6bee5c134 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Sun, 26 Aug 2007 21:01:03 +0000
Subject: [PATCH] Change behavior of ds-cfg-unique-attribute-type attribute so that it is required (mandatory).
---
opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index 16dce4e..9c9a8d8 100644
--- a/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -94,14 +94,8 @@
for(DN baseDN : configuration.getUniqueAttributeBaseDN())
baseDNs.add(baseDN);
//Load attribute types if any.
- for(String attributeType : configuration.getUniqueAttributeType()) {
- AttributeType type =
- DirectoryServer.getAttributeType(attributeType.toLowerCase());
- if(type == null)
- type =
- DirectoryServer.getDefaultAttributeType(attributeType.toLowerCase());
- uniqueAttributeTypes.add(type);
- }
+ for(AttributeType attributeType : configuration.getUniqueAttributeType())
+ uniqueAttributeTypes.add(attributeType);
}
@@ -147,14 +141,8 @@
for(DN baseDN : newConfiguration.getUniqueAttributeBaseDN())
newConfiguredBaseDNs.add(baseDN);
//Load attribute types from new configuration.
- for(String attributeType : newConfiguration.getUniqueAttributeType()) {
- AttributeType type =
- DirectoryServer.getAttributeType(attributeType.toLowerCase());
- if(type == null)
- type =
- DirectoryServer.getDefaultAttributeType(attributeType.toLowerCase());
- newUniqueattributeTypes.add(type);
- }
+ for(AttributeType attributeType : newConfiguration.getUniqueAttributeType())
+ newUniqueattributeTypes.add(attributeType);
//Switch to the new lists and configurations.
baseDNs = newConfiguredBaseDNs;
uniqueAttributeTypes = newUniqueattributeTypes;
--
Gitblit v1.10.0