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/util/LDIFReader.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
index ab83cd9..9274024 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
@@ -800,15 +800,13 @@
String attrDescr = line.substring(0, colonPos);
final Attribute attribute = parseAttrDescription(attrDescr);
final String attrName = attribute.getName();
- final String lowerName = toLowerCase(attrName);
// Now parse the attribute value.
- ByteString value = parseSingleValue(lines, line, entryDN,
- colonPos, attrName);
+ ByteString value = parseSingleValue(lines, line, entryDN, colonPos, attrName);
// See if this is an objectclass or an attribute. Then get the
// corresponding definition and add the value to the appropriate hash.
- if (lowerName.equals("objectclass"))
+ if (attrName.equalsIgnoreCase("objectclass"))
{
if (! importConfig.includeObjectClasses())
{
@@ -840,7 +838,7 @@
}
else
{
- AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(lowerName, attrName);
+ AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(attrName);
if (! importConfig.includeAttribute(attrType))
{
if (logger.isTraceEnabled())
--
Gitblit v1.10.0