From 0b7ce981041f545596271bdcd7a2cf2831f066bc Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 15 Dec 2015 13:59:12 +0000
Subject: [PATCH] OPENDJ-2311 Option -V/--version don't work for SDK tools
---
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
index 3423a51..29467ca 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java
@@ -514,7 +514,7 @@
// information.
writeToUsageOutputStream(getUsage());
return;
- } else if (OPTION_LONG_PRODUCT_VERSION.equals(argName) && getVersionHandler() != null) {
+ } else if (OPTION_LONG_PRODUCT_VERSION.equals(argName)) {
// "--version" will always be interpreted as requesting usage information.
printVersion();
return;
@@ -595,7 +595,7 @@
getUsageArgument().setPresent(true);
}
return;
- } else if (argCharacter == OPTION_SHORT_PRODUCT_VERSION && getVersionHandler() != null) {
+ } else if (argCharacter == OPTION_SHORT_PRODUCT_VERSION) {
// "-V" will always be interpreted as requesting
// version information except if it's already defined.
if (dashVAccepted()) {
@@ -619,7 +619,7 @@
// "-?" will always be interpreted as requesting usage.
writeToUsageOutputStream(getUsage());
return;
- } else if (argCharacter == OPTION_SHORT_PRODUCT_VERSION && getVersionHandler() != null) {
+ } else if (argCharacter == OPTION_SHORT_PRODUCT_VERSION) {
if (dashVAccepted()) {
printVersion();
return;
--
Gitblit v1.10.0