From d79928cc7cd9a3edf6f6a4dcf213234015cd0590 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 29 Jan 2016 15:01:25 +0000
Subject: [PATCH] DirectoryServer.java: Renamed getAttributeTypeOrDefault(String) to getAttributeType(String)
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 6198e7e..6989716 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
@@ -217,20 +217,20 @@
configEntryDN = configEntry.getDN();
// Get all of the attribute types that we will use for schema elements.
- attributeTypesType = getAttributeTypeOrDefault(ATTR_ATTRIBUTE_TYPES_LC);
- objectClassesType = getAttributeTypeOrDefault(ATTR_OBJECTCLASSES_LC);
- matchingRulesType = getAttributeTypeOrDefault(ATTR_MATCHING_RULES_LC);
- ldapSyntaxesType = getAttributeTypeOrDefault(ATTR_LDAP_SYNTAXES_LC);
- ditContentRulesType = getAttributeTypeOrDefault(ATTR_DIT_CONTENT_RULES_LC);
- ditStructureRulesType = getAttributeTypeOrDefault(ATTR_DIT_STRUCTURE_RULES_LC);
- matchingRuleUsesType = getAttributeTypeOrDefault(ATTR_MATCHING_RULE_USE_LC);
- nameFormsType = getAttributeTypeOrDefault(ATTR_NAME_FORMS_LC);
+ attributeTypesType = getAttributeType(ATTR_ATTRIBUTE_TYPES_LC);
+ objectClassesType = getAttributeType(ATTR_OBJECTCLASSES_LC);
+ matchingRulesType = getAttributeType(ATTR_MATCHING_RULES_LC);
+ ldapSyntaxesType = getAttributeType(ATTR_LDAP_SYNTAXES_LC);
+ ditContentRulesType = getAttributeType(ATTR_DIT_CONTENT_RULES_LC);
+ ditStructureRulesType = getAttributeType(ATTR_DIT_STRUCTURE_RULES_LC);
+ matchingRuleUsesType = getAttributeType(ATTR_MATCHING_RULE_USE_LC);
+ nameFormsType = getAttributeType(ATTR_NAME_FORMS_LC);
// Initialize the lastmod attributes.
- creatorsNameType = getAttributeTypeOrDefault(OP_ATTR_CREATORS_NAME_LC);
- createTimestampType = getAttributeTypeOrDefault(OP_ATTR_CREATE_TIMESTAMP_LC);
- modifiersNameType = getAttributeTypeOrDefault(OP_ATTR_MODIFIERS_NAME_LC);
- modifyTimestampType = getAttributeTypeOrDefault(OP_ATTR_MODIFY_TIMESTAMP_LC);
+ creatorsNameType = getAttributeType(OP_ATTR_CREATORS_NAME_LC);
+ createTimestampType = getAttributeType(OP_ATTR_CREATE_TIMESTAMP_LC);
+ modifiersNameType = getAttributeType(OP_ATTR_MODIFIERS_NAME_LC);
+ modifyTimestampType = getAttributeType(OP_ATTR_MODIFY_TIMESTAMP_LC);
// Construct the set of objectclasses to include in the schema entry.
schemaObjectClasses = new LinkedHashMap<>(3);
--
Gitblit v1.10.0