Author: sletellier Date: 2010-10-20 12:32:19 +0200 (Wed, 20 Oct 2010) New Revision: 1932 Url: http://nuiton.org/repositories/revision/nuiton-utils/1932 Log: Use stream to write in file to keep encoding Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-10-17 01:38:37 UTC (rev 1931) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-10-20 10:32:19 UTC (rev 1932) @@ -45,8 +45,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; @@ -540,6 +538,7 @@ * and use Properties parameter as defaults * * Also init converters. + * @param defaults properties * @see ConverterUtil#initConverters() */ public ApplicationConfig(Properties defaults) { @@ -617,11 +616,11 @@ log.debug("Creation of config directory " + file.getParent()); } - Writer writer = new FileWriter(file); + OutputStream stream = new FileOutputStream(file); try { - prop.store(writer, "Last saved " + new java.util.Date()); + prop.store(stream, "Last saved " + new java.util.Date()); } finally { - writer.close(); + stream.close(); } } @@ -1238,7 +1237,7 @@ public Properties getFlatOptions(boolean replaceInner) { Properties props = new Properties(); for (String propertyKey : options.stringPropertyNames()) { - String propertyValue = null; + String propertyValue; if (replaceInner) { // replace ${xxx} option propertyValue = getOption(propertyKey);