Author: simoneg
Date: Fri Jan 2 06:11:37 2009
New Revision: 730726
URL: http://svn.apache.org/viewvc?rev=730726&view=rev
Log:
LABS-260 : downgrade to java 5
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=730726&r1=730725&r2=730726&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
Fri Jan 2 06:11:37 2009
@@ -102,8 +102,10 @@
if (xml) {
np.loadFromXML(stream);
} else {
- InputStreamReader isr = new
InputStreamReader(stream, Charset.forName("UTF-8"));
- np.load(isr);
+ np.load(stream);
+ // TODO reenable this for java 1.6
+ //InputStreamReader isr = new
InputStreamReader(stream, Charset.forName("UTF-8"));
+ //np.load(isr);
}
properties.putAll(np);
} catch (FileNotFoundException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@labs.apache.org
For additional commands, e-mail: commits-h...@labs.apache.org
