From d3f7287f96515499730a23f82871b706b234cf96 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 29 Jan 2016 15:01:22 +0000
Subject: [PATCH] DirectoryServer.java: Removed getAttributeTypeOrDefault(String lowerName, String upperName), replaced by getAttributeTypeOrDefault(String lowerName)
---
opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 32c22f4..485c6ef 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
@@ -700,11 +700,11 @@
case 2:
// It is probably "changeNumber=xxx,cn=changelog", use equality filter
// But it also could be "<service-id>,cn=changelog" so need to check on attribute
- equalityFilter = buildSearchFilterFrom(baseDN, CHANGE_NUMBER_ATTR_LC, CHANGE_NUMBER_ATTR);
+ equalityFilter = buildSearchFilterFrom(baseDN, CHANGE_NUMBER_ATTR);
break;
default:
// "replicationCSN=xxx,<service-id>,cn=changelog" : use equality filter
- equalityFilter = buildSearchFilterFrom(baseDN, "replicationcsn", "replicationCSN");
+ equalityFilter = buildSearchFilterFrom(baseDN, "replicationCSN");
break;
}
@@ -717,10 +717,10 @@
* @return the search filter or {@code null} if attribute is not present in
* the provided DN
*/
- private SearchFilter buildSearchFilterFrom(final DN baseDN, final String lowerCaseAttr, final String upperCaseAttr)
+ private SearchFilter buildSearchFilterFrom(final DN baseDN, final String attrName)
{
final RDN rdn = baseDN.rdn();
- AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(lowerCaseAttr, upperCaseAttr);
+ AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(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(attrNameLowercase, attrNameUppercase);
+ AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(attrNameUppercase);
final Attribute a = addByType
? Attributes.create(attrType, attrValue)
: Attributes.create(attrNameUppercase, attrValue);
--
Gitblit v1.10.0