Make explicit where the default platform encoding is being used

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

Author: sebbASF

src/main/java/org/apache/commons/io/FileSystemUtils.java

@@ -22,6 +22,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -483,7 +484,8 @@ List<String> performCommand(final String[] cmdAttribs, final int max, final long
             in = proc.getInputStream();
             out = proc.getOutputStream();
             err = proc.getErrorStream();
-            inr = new BufferedReader(new InputStreamReader(in));
+            // default charset is most likely appropriate here
+            inr = new BufferedReader(new InputStreamReader(in, Charset.defaultCharset()));
             String line = inr.readLine();
             while (line != null && lines.size() < max) {
                 line = line.toLowerCase(Locale.ENGLISH).trim();

src/main/java/org/apache/commons/io/FileUtils.java

@@ -808,8 +808,9 @@ public static boolean contentEqualsIgnoreEOL(final File file1, final File file2,
         Reader input2 = null;
         try {
             if (charsetName == null) {
-                input1 = new InputStreamReader(new FileInputStream(file1));
-                input2 = new InputStreamReader(new FileInputStream(file2));
+                // N.B. make explicit the use of the default charset
+                input1 = new InputStreamReader(new FileInputStream(file1), Charset.defaultCharset());
+                input2 = new InputStreamReader(new FileInputStream(file2), Charset.defaultCharset());
             } else {
                 input1 = new InputStreamReader(new FileInputStream(file1), charsetName);
                 input2 = new InputStreamReader(new FileInputStream(file2), charsetName);

src/main/java/org/apache/commons/io/HexDump.java

@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
 
 /**
  * Dumps data in hexadecimal format.
@@ -107,7 +108,8 @@ public static void dump(final byte[] data, final long offset,
                 }
             }
             buffer.append(EOL);
-            stream.write(buffer.toString().getBytes());
+            // make explicit the dependency on the default encoding
+            stream.write(buffer.toString().getBytes(Charset.defaultCharset()));
             stream.flush();
             buffer.setLength(0);
             display_offset += chars_read;

src/main/java/org/apache/commons/io/IOUtils.java

@@ -600,7 +600,8 @@ public static byte[] toByteArray(final Reader input, final String encoding) thro
      */
     @Deprecated
     public static byte[] toByteArray(final String input) throws IOException {
-        return input.getBytes();
+        // make explicit the use of the default charset
+        return input.getBytes(Charset.defaultCharset());
     }
 
     /**
@@ -931,7 +932,8 @@ public static String toString(final URL url, final String encoding) throws IOExc
      */
     @Deprecated
     public static String toString(final byte[] input) throws IOException {
-        return new String(input);
+        // make explicit the use of the default charset
+        return new String(input, Charset.defaultCharset());
     }
 
     /**