From ee021bead4d9a72f6f2e6b52222ff4013cbc8b71 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 20 Jan 2015 09:26:46 +0000
Subject: [PATCH] OPENDJ-1734 (CR-5811) V/-version option does not work for some tools
---
opendj3-server-dev/src/server/org/opends/server/util/Base64.java | 46 +++++++++++++---------------------------------
1 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/Base64.java b/opendj3-server-dev/src/server/org/opends/server/util/Base64.java
index bc59e55..4b9dcf6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/Base64.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/Base64.java
@@ -22,11 +22,14 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
-
+import static org.forgerock.util.Reject.*;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.messages.UtilityMessages.*;
+import static org.opends.server.util.StaticUtils.*;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -45,9 +48,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.NullOutputStream;
import org.forgerock.opendj.ldap.ByteSequence;
+import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
+import org.opends.server.types.NullOutputStream;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
@@ -56,13 +59,6 @@
import com.forgerock.opendj.cli.SubCommand;
import com.forgerock.opendj.cli.SubCommandArgumentParser;
-import static org.opends.messages.UtilityMessages.*;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.forgerock.util.Reject.*;
-
-
-
/**
* This class provides methods for performing base64 encoding and decoding.
* Base64 is a mechanism for encoding binary data in ASCII form by converting
@@ -76,16 +72,11 @@
mayInvoke=true)
public final class Base64
{
- /**
- * The set of characters that may be used in base64-encoded values.
- */
+ /** The set of characters that may be used in base64-encoded values. */
private static final char[] BASE64_ALPHABET =
- ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" +
- "0123456789+/").toCharArray();
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray();
- /**
- * Prevent instance creation.
- */
+ /** Prevent instance creation. */
private Base64() {
// No implementation required.
}
@@ -476,6 +467,7 @@
SubCommandArgumentParser argParser =
new SubCommandArgumentParser(Base64.class.getName(), description,
false);
+ argParser.setVersionHandler(new DirectoryServerVersionHandler());
BooleanArgument showUsage = null;
StringArgument encodedData = null;
@@ -583,19 +575,8 @@
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));
- System.exit(1);
- }
+ // version has already been printed
+ System.exit(0);
}
if (subCommand == null)
@@ -785,4 +766,3 @@
}
}
}
-
--
Gitblit v1.10.0