From 3a66dd55b2f91b279497fbdddbc36ea6c16f72b8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 01 Mar 2013 09:52:32 +0000
Subject: [PATCH] OPENDJ-777 ldapcompare should exit with different values w.r.t comparison is successful or not
---
opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java
index bb22123..31e5567 100644
--- a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java
+++ b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2012 ForgeRock AS
+ * Copyright 2012-2013 ForgeRock AS
*/
package com.forgerock.opendj.ldap.tools;
@@ -60,7 +60,6 @@
* @param args
* The command-line arguments provided to this program.
*/
-
public static void main(final String[] args) {
final int retCode = new LDIFDiff().run(args);
System.exit(filterExitCode(retCode));
@@ -109,7 +108,7 @@
// If we should just display usage or version information,
// then print it and exit.
if (argParser.usageOrVersionDisplayed()) {
- return 0;
+ return ResultCode.SUCCESS.intValue();
}
} catch (final ArgumentException ae) {
final LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
@@ -200,13 +199,8 @@
}
return ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue();
} finally {
- closeIfNotNull(sourceReader);
- closeIfNotNull(targetReader);
- closeIfNotNull(outputWriter);
-
- closeIfNotNull(sourceInputStream);
- closeIfNotNull(targetInputStream);
- closeIfNotNull(outputStream);
+ closeIfNotNull(sourceReader, targetReader, outputWriter);
+ closeIfNotNull(sourceInputStream, targetInputStream, outputStream);
}
return ResultCode.SUCCESS.intValue();
--
Gitblit v1.10.0