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/LDIFDiff.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java
index 9ea45dd..3ef2446 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java
@@ -100,7 +100,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();
}
@@ -115,7 +115,7 @@
}
} 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();
}
@@ -136,7 +136,7 @@
final LocalizableMessage message =
ERR_LDIF_FILE_CANNOT_OPEN_FOR_READ.get(trailingArguments.get(0), e
.getLocalizedMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
}
@@ -149,7 +149,7 @@
final LocalizableMessage message =
ERR_LDIF_FILE_CANNOT_OPEN_FOR_READ.get(trailingArguments.get(1), e
.getLocalizedMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
}
@@ -162,7 +162,7 @@
final LocalizableMessage message =
ERR_LDIF_FILE_CANNOT_OPEN_FOR_WRITE.get(outputFilename.getValue(), e
.getLocalizedMessage());
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
}
@@ -185,7 +185,7 @@
target from stdin.*/
if (sourceInputStream == targetInputStream) {
final LocalizableMessage message = ERR_LDIFDIFF_MULTIPLE_USES_OF_STDIN.get();
- println(message);
+ errPrintln(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -196,9 +196,9 @@
LDIF.copyTo(LDIF.diff(sourceReader, targetReader), outputWriter);
} catch (final IOException e) {
if (e instanceof LocalizableException) {
- println(ERR_LDIFDIFF_DIFF_FAILED.get(((LocalizableException) e).getMessageObject()));
+ errPrintln(ERR_LDIFDIFF_DIFF_FAILED.get(((LocalizableException) e).getMessageObject()));
} else {
- println(ERR_LDIFDIFF_DIFF_FAILED.get(e.getLocalizedMessage()));
+ errPrintln(ERR_LDIFDIFF_DIFF_FAILED.get(e.getLocalizedMessage()));
}
return ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue();
} finally {
--
Gitblit v1.10.0