java/code/src/com/redhat/rhn/common/conf/Config.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c2d6a6197e77aec341cc01a7c7340fe854a8cb6b
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Fri Nov 29 15:42:27 2013 +0100
Allow UTF-8 in config file
Needed for java.custom_header, as otherwise
there is no need to use non-ascii characters in config
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java
b/java/code/src/com/redhat/rhn/common/conf/Config.java
index 11573bf..781839d 100644
--- a/java/code/src/com/redhat/rhn/common/conf/Config.java
+++ b/java/code/src/com/redhat/rhn/common/conf/Config.java
@@ -21,6 +21,7 @@ import org.apache.log4j.Logger;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
@@ -412,7 +413,7 @@ public class Config {
Properties props = new Properties();
try {
- props.load(new FileInputStream(curr));
+ props.load(new InputStreamReader(new FileInputStream(curr),
"UTF-8"));
}
catch (IOException e) {
logger.error("Could not parse file " + curr, e);