From 412d2a37f5783a4946bcf2a22ca0e79f95047f04 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Tue, 15 May 2007 08:10:13 +0000
Subject: [PATCH] issue 1430 fix (all utilities should provide as standard option -V/--version) to specify the LDAP protocol version number, we should use now      -V/--ldapVersion  to get the 'product' version    --version

---
 opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java
index 9a5988a..fe137cc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java
@@ -256,8 +256,9 @@
       }
     }
 
-    // If we should just display usage information, then it is already done
-    if ((returnValue == 0) && !argParser.usageDisplayed())
+    // If we should just display usage or version information,
+    // then it is already done
+    if ((returnValue == 0) && !argParser.usageOrVersionDisplayed())
     {
       /* Check that the user only asked for one argument */
       int nArgs = 0;
@@ -295,7 +296,7 @@
       }
     }
 
-    if ((returnValue == 0) && !argParser.usageDisplayed())
+    if ((returnValue == 0) && !argParser.usageOrVersionDisplayed())
     {
       if (enableService.isPresent())
       {

--
Gitblit v1.10.0