From 5e0a551935151242e4308053617c2f487a60d5f0 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 08 Aug 2016 07:31:26 +0000
Subject: [PATCH] Partial OPENDJ-3106 Migrate Entry

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 47b5cb2..6294aef 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
@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -416,9 +417,12 @@
   }
 
   private String getSingleStringValue(Entry entry, String attrName) {
-    List<Attribute> attrList = entry.getAllAttributes(attrName);
-    if (attrList.size() == 1) {
-      Attribute attr = attrList.get(0);
+    Iterator<Attribute> attrs = entry.getAllAttributes(attrName).iterator();
+    if (attrs.hasNext()) {
+      Attribute attr = attrs.next();
+      if (attrs.hasNext()) {
+        return "";
+      }
       if (!attr.isEmpty()) {
         return attr.iterator().next().toString();
       }

--
Gitblit v1.10.0