From 1047226fc3fe1bf42dced7c8afc2ccc6f441657a Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 25 Jan 2013 21:52:52 +0100
Subject: I AM A GOLDEN GOD OF I18N

---
 .../java/com/c2kernel/utils/FileStringUtility.java  | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/main/java/com/c2kernel/utils')

diff --git a/src/main/java/com/c2kernel/utils/FileStringUtility.java b/src/main/java/com/c2kernel/utils/FileStringUtility.java
index 481a1b8..4865a34 100644
--- a/src/main/java/com/c2kernel/utils/FileStringUtility.java
+++ b/src/main/java/com/c2kernel/utils/FileStringUtility.java
@@ -1,7 +1,6 @@
 package com.c2kernel.utils;
 
 //Java
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -11,6 +10,7 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.lang.reflect.Array;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -56,17 +56,14 @@ public class FileStringUtility
 	 **************************************************************************/
 	static public String url2String(java.net.URL location) throws IOException
 	{
-		String resource = "";
-
-		BufferedInputStream file = new BufferedInputStream(location.openStream());
-		byte[] buffer = new byte[file.available()];
-
-		if (file.read(buffer) > 0)
-			resource = new String(buffer);
-
-		file.close();
-
-		return resource;
+        BufferedReader in = new BufferedReader(new InputStreamReader(location.openStream(), "UTF-8"));
+        StringBuffer strbuf = new StringBuffer();
+        String line = in.readLine();
+        while (line != null) {
+        	strbuf.append(line).append('\n');
+        	line = in.readLine();
+        }
+		return strbuf.toString();
 	}
 
 	/**************************************************************************
-- 
cgit v1.2.3