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/ChangelogBackend.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
index 485c6ef..c3e8767 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -200,10 +200,10 @@
/** The attribute type for the "creatorsName" attribute. */
private static final AttributeType CREATORS_NAME_TYPE =
- DirectoryServer.getAttributeTypeOrDefault(OP_ATTR_CREATORS_NAME_LC);
+ DirectoryServer.getAttributeType(OP_ATTR_CREATORS_NAME_LC);
/** The attribute type for the "modifiersName" attribute. */
private static final AttributeType MODIFIERS_NAME_TYPE =
- DirectoryServer.getAttributeTypeOrDefault(OP_ATTR_MODIFIERS_NAME_LC);
+ DirectoryServer.getAttributeType(OP_ATTR_MODIFIERS_NAME_LC);
/** The base DN for the external change log. */
public static final DN CHANGELOG_BASE_DN;
@@ -720,7 +720,7 @@
private SearchFilter buildSearchFilterFrom(final DN baseDN, final String attrName)
{
final RDN rdn = baseDN.rdn();
- AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(attrName);
+ AttributeType attrType = DirectoryServer.getAttributeType(attrName);
final ByteString attrValue = rdn.getAttributeValue(attrType);
if (attrValue != null)
{
@@ -1502,7 +1502,7 @@
final Map<AttributeType, List<Attribute>> userAttrs,
final Map<AttributeType, List<Attribute>> operationalAttrs, final boolean addByType)
{
- AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(attrNameUppercase);
+ AttributeType attrType = DirectoryServer.getAttributeType(attrNameUppercase);
final Attribute a = addByType
? Attributes.create(attrType, attrValue)
: Attributes.create(attrNameUppercase, attrValue);
--
Gitblit v1.10.0