From 7674a40a5274d7aea248cff5b1f2fdd60aee9868 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 28 May 2010 09:59:30 +0000
Subject: [PATCH] Fix issue #3376. Don't use StaticUtils.getBytes(String s) for CLI usage, since it convert strings to UTF-8 and not local charset.
---
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java | 6 +++---
opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index c697851..9a83f6b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -8776,7 +8776,7 @@
public static void printVersion(OutputStream outputStream)
throws IOException
{
- outputStream.write(getBytes(PRINTABLE_VERSION_STRING));
+ outputStream.write(PRINTABLE_VERSION_STRING.getBytes());
// Print extensions' extra information
String extensionInformation =
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
index a202617..fccbfce 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -1512,7 +1512,7 @@
StringBuilder buffer = new StringBuilder();
getUsage(buffer);
- outputStream.write(getBytes(buffer.toString()));
+ outputStream.write(buffer.toString().getBytes());
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
index 087ba25..244ec0c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.util.args;
import org.opends.messages.Message;
@@ -1685,7 +1685,7 @@
getFullUsage(usageGroupArguments.get(a), false, buffer);
}
- outputStream.write(getBytes(buffer.toString()));
+ outputStream.write(buffer.toString().getBytes());
}
@@ -1694,7 +1694,7 @@
*/
public void getUsage(OutputStream outputStream)
throws IOException {
- outputStream.write(getBytes(String.valueOf(getUsage())));
+ outputStream.write(getUsage().getBytes());
}
--
Gitblit v1.10.0