From 08b43d500a8aab4d29906c60820ca0983ead359e Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 18 Mar 2008 10:58:28 +0000
Subject: [PATCH] Fix for issue 3076 (base64 -V or --version doesn't work)
---
opends/src/server/org/opends/server/util/Base64.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/Base64.java b/opends/src/server/org/opends/server/util/Base64.java
index 5da9ed5..054c9eb 100644
--- a/opends/src/server/org/opends/server/util/Base64.java
+++ b/opends/src/server/org/opends/server/util/Base64.java
@@ -44,6 +44,7 @@
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.types.NullOutputStream;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
@@ -513,7 +514,7 @@
}
SubCommand subCommand = argParser.getSubCommand();
- if (showUsage.isPresent())
+ if (argParser.isUsageArgumentPresent())
{
if (subCommand == null)
{
@@ -529,6 +530,23 @@
return;
}
+ if (argParser.isVersionArgumentPresent())
+ {
+ // We have to print the version since we have set a NullOutputStream on
+ // the parser
+ try
+ {
+ DirectoryServer.printVersion(System.out);
+ System.exit(0);
+ }
+ catch (Throwable t)
+ {
+ // Bug
+ System.err.println(ERR_UNEXPECTED.get(t.toString()).toString());
+ System.exit(1);
+ }
+ }
+
if (subCommand == null)
{
System.err.println(argParser.getUsage());
--
Gitblit v1.10.0