harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r764832 - /harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java
Date Tue, 14 Apr 2009 15:35:26 GMT
Author: odeakin
Date: Tue Apr 14 15:35:25 2009
New Revision: 764832

URL: http://svn.apache.org/viewvc?rev=764832&view=rev
Log:
Small change to make sure properties files are read in with the correct encoding on non-ASCII
platforms.

Modified:
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java?rev=764832&r1=764831&r2=764832&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java
Tue Apr 14 15:35:25 2009
@@ -20,6 +20,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.AccessController;
@@ -479,7 +480,7 @@
             if (stream != null) {
                 try {
                     try {
-                        bundle = new PropertyResourceBundle(stream);
+                        bundle = new PropertyResourceBundle(new InputStreamReader(stream));
                     } finally {
                         stream.close();
                     }
@@ -928,7 +929,7 @@
                 }
                 if (streams != null) {
                     try {
-                        ret = new PropertyResourceBundle(streams);
+                        ret = new PropertyResourceBundle(new InputStreamReader(streams));
                         ret.setLocale(locale);
                         streams.close();
                     } catch (IOException e) {



Mime
View raw message