X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fstreams%2FBase64.java;h=a4f1240aa6603109cf6fb14f17862dafaed59678;hb=a6a73de36765b85947ac885529da82d3e7189269;hp=9ccd02ce3e39e7da4a0b02e98a75ff2bebd5b219;hpb=a20e02bbb6efd91f99af9ad37dc5a1414393b008;p=fanfix.git

diff --git a/src/be/nikiroo/utils/streams/Base64.java b/src/be/nikiroo/utils/streams/Base64.java
index 9ccd02c..a4f1240 100644
--- a/src/be/nikiroo/utils/streams/Base64.java
+++ b/src/be/nikiroo/utils/streams/Base64.java
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/*
+ * Changes (@author niki):
+ * - default charset -> UTF-8
+ */
+
 package be.nikiroo.utils.streams;
 
 import java.io.UnsupportedEncodingException;
@@ -115,7 +120,12 @@ class Base64 {
      * incorrect padding
      */
     public static byte[] decode(String str, int flags) {
-        return decode(str.getBytes(), flags);
+    	try{
+    		return decode(str.getBytes("UTF-8"), flags);
+    	} catch (UnsupportedEncodingException e) {
+    		// All conforming JVM are expected to support UTF-8
+    		return null;
+    	}
     }
 
     /**