X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FIOUtils.java;fp=src%2Fbe%2Fnikiroo%2Futils%2FIOUtils.java;h=35481b2cf0d1576e68814191296b3d8fdafca25d;hb=3f8349b761d29cd3d5381f076d706014574eeb43;hp=83dcd502b242fb26d88b611b1d7ff4e7d1a30c17;hpb=cd0c27d2e457ea19fcd9def879e1534a528292c2;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index 83dcd50..35481b2 100644
--- a/src/be/nikiroo/utils/IOUtils.java
+++ b/src/be/nikiroo/utils/IOUtils.java
@@ -4,10 +4,10 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -173,12 +173,34 @@ public class IOUtils {
 	 *             in case of I/O error
 	 */
 	public static String readSmallFile(File file) throws IOException {
-		BufferedReader reader = new BufferedReader(new FileReader(file));
+		InputStream stream = new FileInputStream(file);
+		try {
+			return readSmallStream(stream);
+		} finally {
+			stream.close();
+		}
+	}
+
+	/**
+	 * Read the whole {@link InputStream} content into a {@link String}.
+	 * 
+	 * @param stream
+	 *            the {@link InputStream}
+	 * 
+	 * @return the content
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	public static String readSmallStream(InputStream stream) throws IOException {
+		BufferedReader reader = new BufferedReader(
+				new InputStreamReader(stream));
 		try {
 			StringBuilder builder = new StringBuilder();
 			for (String line = reader.readLine(); line != null; line = reader
 					.readLine()) {
 				builder.append(line);
+				builder.append("\n");
 			}
 			return builder.toString();
 		} finally {