From ee0f6d7f8391f7b8bddbc1a77442e1e2949c78e3 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 07 Feb 2014 16:47:06 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1303 Due to change in console application, modified files to redirect errors on err stream.
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
index fc27fdc..4b5d472 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
@@ -174,7 +174,7 @@
argParser.setUsageArgument(showUsage, getOutputStream());
} catch (final ArgumentException ae) {
final LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -191,7 +191,7 @@
connectionFactory = connectionFactoryProvider.getAuthenticatedConnectionFactory();
} catch (final ArgumentException ae) {
final LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -199,11 +199,11 @@
try {
final int versionNumber = version.getIntValue();
if (versionNumber != 2 && versionNumber != 3) {
- println(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(versionNumber)));
+ errPrintln(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(versionNumber)));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
} catch (final ArgumentException ae) {
- println(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(version.getValue())));
+ errPrintln(ERR_DESCRIPTION_INVALID_VERSION.get(String.valueOf(version.getValue())));
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -215,7 +215,7 @@
} catch (final DecodeException de) {
final LocalizableMessage message =
ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString);
- println(message);
+ errPrintln(message);
ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
}
@@ -225,7 +225,7 @@
final LocalizableMessage message =
ERR_LDAPPWMOD_CONFLICTING_ARGS.get(newPW.getLongIdentifier(), newPWFile
.getLongIdentifier());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -233,7 +233,7 @@
final LocalizableMessage message =
ERR_LDAPPWMOD_CONFLICTING_ARGS.get(currentPW.getLongIdentifier(), currentPWFile
.getLongIdentifier());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -267,18 +267,18 @@
LocalizableMessage message =
ERR_LDAPPWMOD_FAILED.get(e.getResult().getResultCode().intValue(), e
.getResult().getResultCode().toString());
- println(message);
+ errPrintln(message);
final String errorMessage = e.getResult().getDiagnosticMessage();
if ((errorMessage != null) && (errorMessage.length() > 0)) {
message = ERR_LDAPPWMOD_FAILURE_ERROR_MESSAGE.get(errorMessage);
- println(message);
+ errPrintln(message);
}
final String matchedDN = e.getResult().getMatchedDN();
if (matchedDN != null && matchedDN.length() > 0) {
message = ERR_LDAPPWMOD_FAILURE_MATCHED_DN.get(matchedDN);
- println(message);
+ errPrintln(message);
}
return e.getResult().getResultCode().intValue();
}
--
Gitblit v1.10.0