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/admin/AdministrationDataSync.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
index 192e3d9..8779018 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
@@ -109,8 +109,8 @@
return;
}
- AttributeType attrType1 = DirectoryServer.getAttributeTypeOrDefault("adminport".toLowerCase());
- AttributeType attrType2 = DirectoryServer.getAttributeTypeOrDefault("adminEnabled".toLowerCase());
+ AttributeType attrType1 = DirectoryServer.getAttributeType("adminport");
+ AttributeType attrType2 = DirectoryServer.getAttributeType("adminEnabled");
LinkedList<Modification> mods = new LinkedList<>();
mods.add(new Modification(ModificationType.REPLACE, Attributes.create(attrType1, adminPort)));
@@ -137,7 +137,7 @@
String val = getAttr("cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config", "ds-cfg-enabled");
if (val != null)
{
- ldapsPortEnable = "true".equals(val.toLowerCase());
+ ldapsPortEnable = "true".equalsIgnoreCase(val);
}
if (ldapPort == null && ldapsPort == null)
{
@@ -257,7 +257,7 @@
adminConnectorEntry = result.getFirst();
}
- AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(attrName);
+ AttributeType attrType = DirectoryServer.getAttributeType(attrName);
List<Attribute> attrs = adminConnectorEntry.getAttribute(attrType);
if (!attrs.isEmpty())
{
--
Gitblit v1.10.0