[freenet-cvs] r14966 - trunk/freenet/src/freenet/support/io

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-09-04 21:54:43 +0000 (Tue, 04 Sep 2007)
New Revision: 14966

Modified:
   trunk/freenet/src/freenet/support/io/FileUtil.java
Log:
Fix it for real now ;)
I know, instead of blaming svk I should blame my own stupidity.

Modified: trunk/freenet/src/freenet/support/io/FileUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FileUtil.java  2007-09-04 21:53:04 UTC 
(rev 14965)
+++ trunk/freenet/src/freenet/support/io/FileUtil.java  2007-09-04 21:54:43 UTC 
(rev 14966)
@@ -76,7 +76,6 @@
                return result;
        }

-       // FIXME: this is called readUTF but it reads in the default charset 
... eh??
        public static String readUTF(File file) throws FileNotFoundException, 
IOException {
                StringBuffer result = new StringBuffer();
                FileInputStream fis = null;
@@ -86,7 +85,7 @@
                try {
                        fis = new FileInputStream(file);
                        bis = new BufferedInputStream(fis);
-                       isr = new InputStreamReader(bis);
+                       isr = new InputStreamReader(bis, "UTF-8");

                        char[] buf = new char[4096];
                        int length = 0;