From 0841dd13681c9543b393a18487ef7f259859eaf1 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 15 Oct 2015 19:38:35 +0000
Subject: [PATCH] Hide DirectoryServer.getDefaultAttributeType(String, Syntax) the best possible.
---
opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java
index 1506225..2100e95 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java
@@ -38,7 +38,12 @@
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.ObjectClass;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.config.ConfigConstants.*;
@@ -214,11 +219,8 @@
public void putConfigAttribute(ConfigAttribute attribute)
{
String name = attribute.getName();
- AttributeType attrType = DirectoryServer.getAttributeTypeOrNull(name.toLowerCase());
- if (attrType == null)
- {
- attrType = DirectoryServer.getDefaultAttributeType(name, attribute.getSyntax());
- }
+ AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(
+ name.toLowerCase(), name, attribute.getSyntax());
List<Attribute> attrs = new ArrayList<>(2);
AttributeBuilder builder = new AttributeBuilder(attrType, name);
--
Gitblit v1.10.0