Make explicit where the default platform encoding is being used

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1468885 13f79535-47bb-0310-9956-ffa450edef68

Author: sebbASF

src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java

@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.io.Serializable;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 
 import org.apache.commons.io.IOUtils;
@@ -168,7 +169,7 @@ public MagicNumberFileFilter(final String magicNumber, final long offset) {
             throw new IllegalArgumentException("The offset cannot be negative");
         }
 
-        this.magicNumbers = magicNumber.getBytes(); // uses the platform default charset
+        this.magicNumbers = magicNumber.getBytes(Charset.defaultCharset()); // explicitly uses the platform default charset
         this.byteOffset = offset;
     }
 
@@ -267,7 +268,7 @@ public boolean accept(final File file) {
     public String toString() {
         final StringBuilder builder = new StringBuilder(super.toString());
         builder.append("(");
-        builder.append(new String(magicNumbers));// TODO perhaps use hex if value is not printable
+        builder.append(new String(magicNumbers, Charset.defaultCharset()));// TODO perhaps use hex if value is not printable
         builder.append(",");
         builder.append(this.byteOffset);
         builder.append(")");

src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java

@@ -22,6 +22,7 @@
 import java.io.OutputStream;
 import java.io.SequenceInputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -336,13 +337,15 @@ public synchronized byte[] toByteArray() {
     }
 
     /**
-     * Gets the curent contents of this byte stream as a string.
+     * Gets the curent contents of this byte stream as a string
+     * using the platform default charset.
      * @return the contents of the byte array as a String
      * @see java.io.ByteArrayOutputStream#toString()
      */
     @Override
     public String toString() {
-        return new String(toByteArray());
+        // make explicit the use of the default charset
+        return new String(toByteArray(), Charset.defaultCharset());
     }
 
     /**