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/LDAPDelete.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
index 30db426..9c0513a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
@@ -559,8 +559,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;
}
@@ -587,7 +586,7 @@
} catch(ArgumentException ae)
{
logger.traceException(ae);
- printWrappedText(err, ae.getMessage());
+ argParser.displayMessageAndUsageReference(err, ae.getMessageObject());
return CLIENT_SIDE_PARAM_ERROR;
}
@@ -603,7 +602,7 @@
} catch(ArgumentException ae)
{
logger.traceException(ae);
- printWrappedText(err, ae.getMessage());
+ argParser.displayMessageAndUsageReference(err, ae.getMessageObject());
return CLIENT_SIDE_PARAM_ERROR;
}
@@ -659,7 +658,6 @@
if(ctrl == null)
{
printWrappedText(err, ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString));
- err.println(argParser.getUsage());
return CLIENT_SIDE_PARAM_ERROR;
}
deleteOptions.getControls().add(ctrl);
@@ -778,7 +776,13 @@
lce.getErrorMessage(),
lce.getMatchedDN());
return lce.getResultCode();
- } catch(Exception e)
+ }
+ catch(ArgumentException e)
+ {
+ argParser.displayMessageAndUsageReference(err, e.getMessageObject());
+ return 1;
+ }
+ catch (Exception e)
{
logger.traceException(e);
printWrappedText(err, e.getMessage());
--
Gitblit v1.10.0