From d10da5e09878c255bd3b685fa87a04610db7d404 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Fix compilation errors
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index 4448a00..49b2bf9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -113,10 +113,8 @@
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
-import org.forgerock.opendj.config.ConfigurationFramework;
-import org.opends.server.api.ConfigHandler;
-import org.opends.server.types.Entry;
-import org.opends.server.core.DirectoryServer;
+import org.opends.server.admin.ClassLoaderProvider;
+import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.LockFileManager;
import org.opends.server.schema.SchemaConstants;
import org.opends.server.schema.SomeSchemaElement;
@@ -2312,19 +2310,18 @@
* @throws OpenDsException if an error occurs.
* @throws ConfigException if an error occurs.
*/
- public static void deleteConfigSubtree(ConfigHandler confHandler, DN dn)
+ public static void deleteConfigSubtree(ConfigurationHandler confHandler, DN dn)
throws OpenDsException, ConfigException
{
- Entry confEntry = confHandler.getConfigEntry(dn);
+ org.forgerock.opendj.ldap.Entry confEntry = confHandler.getEntry(dn);
if (confEntry != null)
{
// Copy the values to avoid problems with this recursive method.
- ArrayList<DN> childDNs = new ArrayList<>(confEntry.getChildren().keySet());
- for (DN childDN : childDNs)
+ for (DN childDN : new ArrayList<>(confHandler.getChildren(dn)))
{
deleteConfigSubtree(confHandler, childDN);
}
- confHandler.deleteEntry(dn, null);
+ confHandler.deleteEntry(dn);
}
}
--
Gitblit v1.10.0