From c430f8b3da724d0a117eadd172b92179b9a0b5a9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 21 Mar 2014 11:59:48 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3232) Remove AttributeValue
---
opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagementContext.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagementContext.java b/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagementContext.java
index e8dd49d..f29d94b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagementContext.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/server/ServerManagementContext.java
@@ -24,11 +24,8 @@
* Copyright 2009 Sun Microsystems, Inc.
* Portions Copyright 2014 ForgeRock AS
*/
-
package org.opends.server.admin.server;
-
-
import static org.opends.messages.AdminMessages.*;
import static org.opends.server.admin.PropertyException.*;
import static org.opends.server.util.StaticUtils.*;
@@ -77,7 +74,6 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeValueIterable;
import org.opends.server.types.AttributeType;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
@@ -905,9 +901,15 @@
List<Attribute> attributes = configEntry.getEntry().getAttribute(type, true);
List<ByteString> results = new LinkedList<ByteString>();
- for (ByteString v : new AttributeValueIterable(attributes))
+ if (attributes != null)
{
- results.add(v);
+ for (Attribute a : attributes)
+ {
+ for (ByteString v : a)
+ {
+ results.add(v);
+ }
+ }
}
return results;
}
--
Gitblit v1.10.0