From 7ddd4a6c4c2fbce71c8071bca380e5c5402e697c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 24 Sep 2015 12:05:10 +0000
Subject: [PATCH] OPENDJ-1857 LDIF changerecord parsing should be less case sensitive
---
opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
index f040273..c9b9ca4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
@@ -27,28 +27,28 @@
package org.opends.server.tools.tasks;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.backends.task.FailedDependencyAction;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
-import org.opends.server.types.Entry;
-import org.opends.server.types.AttributeType;
import org.opends.server.types.Attribute;
-import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
-import java.util.Set;
import java.util.HashSet;
import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
+import java.util.Set;
import java.util.TimeZone;
-import java.util.Date;
-import java.util.Collections;
import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
import java.text.DateFormat;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import static org.opends.server.util.ServerConstants.*;
@@ -133,12 +133,11 @@
// Build a map of non-superior attribute value pairs for display
Map<AttributeType, List<Attribute>> attrMap = entry.getUserAttributes();
for (AttributeType type : attrMap.keySet()) {
- String typeName = type.getNormalizedPrimaryName();
+ String typeName = type.getNameOrOID();
// See if we've handled it already above
if (!supAttrNames.contains(typeName)) {
- LocalizableMessage attrTypeName = getAttributeDisplayName(
- type.getNormalizedPrimaryName());
+ LocalizableMessage attrTypeName = getAttributeDisplayName(typeName);
List<Attribute> attrList = entry.getUserAttribute(type);
for (Attribute attr : attrList) {
for (ByteString av : attr) {
--
Gitblit v1.10.0