Author: sebb
Date: Wed Apr 17 13:02:40 2013
New Revision: 1468883
URL: http://svn.apache.org/r1468883
Log:
Make explicit where the default platform encoding is being used
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java?rev=1468883&r1=1468882&r2=1468883&view=diff
==============================================================================
---
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java
(original)
+++
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java
Wed Apr 17 13:02:40 2013
@@ -22,6 +22,7 @@ import java.io.IOException;
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 @@ public class FileSystemUtils {
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();
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java?rev=1468883&r1=1468882&r2=1468883&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
Wed Apr 17 13:02:40 2013
@@ -808,8 +808,9 @@ public class FileUtils {
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);
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java?rev=1468883&r1=1468882&r2=1468883&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java
Wed Apr 17 13:02:40 2013
@@ -18,6 +18,7 @@ package org.apache.commons.io;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.Charset;
/**
* Dumps data in hexadecimal format.
@@ -107,7 +108,8 @@ public class HexDump {
}
}
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;
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java?rev=1468883&r1=1468882&r2=1468883&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
Wed Apr 17 13:02:40 2013
@@ -600,7 +600,8 @@ public class IOUtils {
*/
@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 class IOUtils {
*/
@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());
}
/**
