From 6dee41dc50e9e716c7aac50f0f1bce9047465843 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Rename config-small.ldif to configForTests/config-small.ldif
---
opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
index 08f30e3..46f5161 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -304,10 +305,11 @@
*/
public static List<org.opends.server.types.Attribute> toAttributes(
final Iterable<org.forgerock.opendj.ldap.Attribute> listOfAttributes) {
- List<org.opends.server.types.Attribute> toListOfAttributes =
- new ArrayList<>(((Collection<?>) listOfAttributes).size());
- for (org.forgerock.opendj.ldap.Attribute a : listOfAttributes) {
- toListOfAttributes.add(toAttribute(a));
+ List<org.opends.server.types.Attribute> toListOfAttributes = new ArrayList<>();
+ Iterator<Attribute> it = listOfAttributes.iterator();
+ while (it.hasNext())
+ {
+ toListOfAttributes.add(toAttribute(it.next()));
}
return toListOfAttributes;
}
@@ -508,6 +510,7 @@
final org.opends.server.types.Entry srvResultEntry) {
final org.forgerock.opendj.ldap.Entry entry = new LinkedHashMapEntry(srvResultEntry.getName().toString());
+ entry.addAttribute(from(srvResultEntry.getObjectClassAttribute()));
for (org.opends.server.types.Attribute a : srvResultEntry.getAttributes()) {
entry.addAttribute(from(a));
}
--
Gitblit v1.10.0