From 7dd6fde7e736d14835d08172bc82bed1e4643a1a Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 23 Feb 2015 17:26:52 +0000
Subject: [PATCH] OPENDJ-1792: Disable debugging on two server tools
---
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java | 3 +++
opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
index 46c23dd..5bb1347 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
@@ -28,10 +28,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.DecodeException;
-
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-
+import org.opends.server.loggers.JDKLogging;
import org.opends.server.tools.tasks.TaskClient;
import org.opends.server.tools.tasks.TaskEntry;
import org.opends.server.types.InitializationException;
@@ -68,6 +67,7 @@
import java.util.TreeMap;
import static org.opends.messages.ToolMessages.*;
+
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.filterExitCode;
@@ -209,6 +209,8 @@
{
DirectoryServer.bootstrapClient();
}
+ JDKLogging.disableLogging();
+
// Create the command-line argument parser for use with this program.
LDAPConnectionArgumentParser argParser = new LDAPConnectionArgumentParser(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java
index 8f3ad79..cfee7b9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java
@@ -42,6 +42,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
+import org.opends.server.loggers.JDKLogging;
import org.opends.server.types.AttributeType;
import org.opends.server.types.ExistingFileBehavior;
import org.opends.server.types.InitializationException;
@@ -129,6 +130,8 @@
{
out = NullOutputStream.wrapOrNullStream(outStream);
err = NullOutputStream.wrapOrNullStream(errStream);
+ JDKLogging.disableLogging();
+
// Create and initialize the argument parser for this program.
LocalizableMessage toolDescription = INFO_MAKELDIF_TOOL_DESCRIPTION.get();
--
Gitblit v1.10.0