From 08a8540072a370b4e7e9604eb97818dcfd4d74c6 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 14:00:38 +0000
Subject: [PATCH] OPENDJ-2773 Remove duplicated server tools
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index 0011ec2..02ff31e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -86,7 +86,6 @@
import org.opends.server.tools.BackendTypeHelper;
import org.opends.server.tools.BackendTypeHelper.BackendTypeUIAdapter;
import org.opends.server.tools.ImportLDIF;
-import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.makeldif.EntryWriter;
import org.opends.server.tools.makeldif.MakeLDIFException;
import org.opends.server.tools.makeldif.TemplateEntry;
@@ -839,7 +838,6 @@
else
{
// If we are not local, we use ldapmodify to update the contents.
- args.add("-a");
args.add("-f");
args.add(ldifFile);
}
@@ -1197,16 +1195,9 @@
}
try
{
- if (isServerRunning())
+ if (isServerRunning() && (isLocal() || importLDIF))
{
- if (isLocal() || importLDIF)
- {
- returnCode = ImportLDIF.mainImportLDIF(args, false, outPrintStream, errorPrintStream);
- }
- else
- {
- returnCode = LDAPModify.mainModify(args, false, outPrintStream, errorPrintStream);
- }
+ returnCode = ImportLDIF.mainImportLDIF(args, false, outPrintStream, errorPrintStream);
}
else
{
--
Gitblit v1.10.0