From e25fdd4dba837c79b4530c7a7db7c9e4abffd754 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 03 Feb 2015 15:21:32 +0000
Subject: [PATCH] Fixing failing tests in Jenkins.
---
opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
index ed1c0e1..32b85ae 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
@@ -836,9 +836,9 @@
*/
@Override
public String getUsage() {
- final StringBuilder buffer = new StringBuilder();
-
setUsageOrVersionDisplayed(true);
+
+ final StringBuilder buffer = new StringBuilder();
if (subCommand == null) {
if (System.getProperty("org.forgerock.opendj.gendoc") != null) {
generateReferenceDoc(buffer, subCommands.values());
@@ -853,7 +853,6 @@
} else {
getSubCommandUsage(buffer, subCommand);
}
-
return buffer.toString();
}
@@ -885,8 +884,9 @@
/** Get usage for a specific usage argument. */
private void getUsage(Argument a) {
- final StringBuilder buffer = new StringBuilder();
+ setUsageOrVersionDisplayed(true);
+ final StringBuilder buffer = new StringBuilder();
final boolean isUsageArgument = isUsageArgument(a);
if (isUsageArgument && subCommand != null) {
getSubCommandUsage(buffer, subCommand);
@@ -900,7 +900,6 @@
// Requested help on specific group - don't display global options.
getFullUsage(usageGroupArguments.get(a), false, buffer);
}
-
writeToUsageOutputStream(buffer);
}
--
Gitblit v1.10.0