From 0fd845d18cfaf23fc9f54e92775c735955e4e859 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 27 Jul 2015 09:02:08 +0000
Subject: [PATCH] OPENDJ-2027 CR-7646 Change tools message on error
---
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompare.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompare.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompare.java
index 531e854..45630c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompare.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompare.java
@@ -657,8 +657,7 @@
}
catch (ArgumentException ae)
{
- printWrappedText(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
return CLIENT_SIDE_PARAM_ERROR;
}
@@ -759,7 +758,7 @@
portNumber = port.getIntValue();
} catch (ArgumentException ae)
{
- printWrappedText(err, ae.getMessage());
+ argParser.displayMessageAndUsageReference(err, ae.getMessageObject());
return CLIENT_SIDE_PARAM_ERROR;
}
@@ -774,7 +773,7 @@
connectionOptions.setVersionNumber(versionNumber);
} catch(ArgumentException ae)
{
- printWrappedText(err, ae.getMessage());
+ argParser.displayMessageAndUsageReference(err, ae.getMessageObject());
return CLIENT_SIDE_PARAM_ERROR;
}
@@ -829,7 +828,6 @@
if(ctrl == null)
{
printWrappedText(err, ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString));
- err.println(argParser.getUsage());
return CLIENT_SIDE_PARAM_ERROR;
}
compareOptions.getControls().add(ctrl);
--
Gitblit v1.10.0