X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FIOUtils.java;h=973a61b0da541362a9a44069555bbe42a5adfb45;hb=530d4062471346d6ececf76d74a0358c91323998;hp=83dcd502b242fb26d88b611b1d7ff4e7d1a30c17;hpb=b771aed5070864bbcbae286c8de74478f6837618;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index 83dcd50..973a61b 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,17 +173,39 @@ 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 {
-			StringBuilder builder = new StringBuilder();
-			for (String line = reader.readLine(); line != null; line = reader
-					.readLine()) {
-				builder.append(line);
-			}
-			return builder.toString();
+			return readSmallStream(stream);
 		} finally {
-			reader.close();
+			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 {
+		// do NOT close the reader, or the related stream will be closed, too
+		// reader.close();
+		BufferedReader reader = new BufferedReader(
+				new InputStreamReader(stream));
+
+		StringBuilder builder = new StringBuilder();
+		for (String line = reader.readLine(); line != null; line = reader
+				.readLine()) {
+			builder.append(line);
+			builder.append("\n");
 		}
+
+		return builder.toString();
 	}
 
 	/**