You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2010/02/15 15:55:02 UTC
svn commit: r910228 -
/labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/SettingsHolder.java
Author: simoneg
Date: Mon Feb 15 14:55:01 2010
New Revision: 910228
URL: http://svn.apache.org/viewvc?rev=910228&view=rev
Log:
Use java 6 method for loading UTF-8 properties
Modified:
labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/SettingsHolder.java
Modified: labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/SettingsHolder.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/SettingsHolder.java?rev=910228&r1=910227&r2=910228&view=diff
==============================================================================
--- labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/SettingsHolder.java (original)
+++ labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/SettingsHolder.java Mon Feb 15 14:55:01 2010
@@ -21,7 +21,9 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.net.URL;
+import java.nio.charset.Charset;
import java.util.Collections;
import java.util.HashMap;
import java.util.InvalidPropertiesFormatException;
@@ -111,10 +113,10 @@
if (xml) {
np.loadFromXML(stream);
} else {
- np.load(stream);
- // TODO reenable this for java 1.6
- //InputStreamReader isr = new InputStreamReader(stream, Charset.forName("UTF-8"));
- //np.load(isr);
+ // This was in java 1.5, but used ISO-8859-1.
+ //np.load(stream);
+ InputStreamReader isr = new InputStreamReader(stream, Charset.forName("UTF-8"));
+ np.load(isr);
}
properties.putAll(np);
} catch (FileNotFoundException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org