From fada6080f86ea8cbc8369e3263b97f086460cb29 Mon Sep 17 00:00:00 2001
From: sin <sin@localhost>
Date: Mon, 30 Mar 2009 18:26:03 +0000
Subject: [PATCH] Issue#3910:Base64 encoding doesn't work with UTF-8 chars
---
opends/src/server/org/opends/server/util/Base64.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/Base64.java b/opends/src/server/org/opends/server/util/Base64.java
index bb8a518..842e36e 100644
--- a/opends/src/server/org/opends/server/util/Base64.java
+++ b/opends/src/server/org/opends/server/util/Base64.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.util;
@@ -37,6 +37,7 @@
import java.io.FileWriter;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.text.ParseException;
import java.util.ArrayList;
@@ -607,7 +608,15 @@
byte[] dataToEncode = null;
if (rawData.isPresent())
{
- dataToEncode = rawData.getValue().getBytes();
+ try
+ {
+ dataToEncode = rawData.getValue().getBytes("UTF-8");
+ }
+ catch(UnsupportedEncodingException ex)
+ {
+ System.err.println(ERR_UNEXPECTED.get(ex.toString()).toString());
+ System.exit(1);
+ }
}
else
{
--
Gitblit v1.10.0