X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FIOUtils.java;h=0004a4e7d79008d303a5c00abf238f1ec65352fc;hb=c1e7c70dbaaaf8efb5d977ed0e5b1128827355ed;hp=9cdaba840af79727fba495b2095af03cf5918c2f;hpb=e378894c40d45740da6498fe9020e7628d485e35;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index 9cdaba8..0004a4e 100644
--- a/src/be/nikiroo/utils/IOUtils.java
+++ b/src/be/nikiroo/utils/IOUtils.java
@@ -13,6 +13,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
+import be.nikiroo.utils.streams.MarkableFileInputStream;
+
 /**
  * This class offer some utilities based around Streams and Files.
  * 
@@ -54,7 +56,7 @@ public class IOUtils {
 			throws IOException {
 		byte buffer[] = new byte[4096];
 		int len = in.read(buffer);
-		while (len > 0) {
+		while (len > -1) {
 			out.write(buffer, 0, len);
 			len = in.read(buffer);
 		}
@@ -230,7 +232,7 @@ public class IOUtils {
 			throws IOException {
 		FileOutputStream out = new FileOutputStream(file);
 		try {
-			out.write(content.getBytes("UTF-8"));
+			out.write(StringUtils.getBytes(content));
 		} finally {
 			out.close();
 		}
@@ -408,19 +410,11 @@ public class IOUtils {
 			write(in, tmp);
 			in.close();
 
-			final FileInputStream fis = new FileInputStream(tmp);
-			return new MarkableFileInputStream(fis) {
+			return new MarkableFileInputStream(tmp) {
 				@Override
 				public void close() throws IOException {
 					try {
-						try {
-							super.close();
-						} finally {
-							try {
-								fis.close();
-							} catch (IOException e) {
-							}
-						}
+						super.close();
 					} finally {
 						tmp.delete();
 					}