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/backends/SchemaBackend.java | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 4cad0f0..4e4a2b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -3628,14 +3628,8 @@
{
attrTypeSyntax = CoreSchema.getAttributeTypeDescriptionSyntax();
}
-
- AttributeType attributeAttrType = schema.getAttributeType(ATTR_ATTRIBUTE_TYPES_LC);
- if (attributeAttrType == null)
- {
- attributeAttrType =
- DirectoryServer.getDefaultAttributeType(ATTR_ATTRIBUTE_TYPES,
- attrTypeSyntax);
- }
+ AttributeType attributeAttrType = DirectoryServer.getAttributeTypeOrDefault(
+ ATTR_ATTRIBUTE_TYPES_LC, ATTR_ATTRIBUTE_TYPES, attrTypeSyntax);
// loop on the attribute types in the entry just received
// and add them in the existing schema.
@@ -3720,15 +3714,8 @@
{
ocSyntax = CoreSchema.getObjectClassDescriptionSyntax();
}
-
- AttributeType objectclassAttrType =
- schema.getAttributeType(ATTR_OBJECTCLASSES_LC);
- if (objectclassAttrType == null)
- {
- objectclassAttrType =
- DirectoryServer.getDefaultAttributeType(ATTR_OBJECTCLASSES,
- ocSyntax);
- }
+ AttributeType objectclassAttrType = DirectoryServer.getAttributeTypeOrDefault(
+ ATTR_OBJECTCLASSES_LC, ATTR_OBJECTCLASSES, ocSyntax);
oidList.clear();
List<Attribute> ocList = newSchemaEntry.getAttribute(objectclassAttrType);
--
Gitblit v1.10.0