You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2016/06/16 05:55:32 UTC
kylin git commit: KYLIN-1781 fix config encoding error
Repository: kylin
Updated Branches:
refs/heads/master 7a05309bf -> a179136be
KYLIN-1781 fix config encoding error
Signed-off-by: Hongbin Ma <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a179136b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a179136b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a179136b
Branch: refs/heads/master
Commit: a179136beabcad7a2cbb766d448d9acf88194245
Parents: 7a05309
Author: zhaotianshuo <zh...@meizu.com>
Authored: Mon Jun 13 13:33:55 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Thu Jun 16 13:45:47 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/common/KylinConfig.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a179136b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
index 580edd8..b4b3c1b 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -18,6 +18,7 @@
package org.apache.kylin.common;
+import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -26,6 +27,7 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Enumeration;
@@ -197,9 +199,9 @@ public class KylinConfig extends KylinConfigBase {
fis = new FileInputStream(propFile);
fis2 = new FileInputStream(overrideFile);
Properties conf = new Properties();
- conf.load(fis);
+ conf.load(new BufferedReader(new InputStreamReader(fis, "UTF-8")));
Properties override = new Properties();
- override.load(fis2);
+ override.load(new BufferedReader(new InputStreamReader(fis2, "UTF-8")));
for (Map.Entry<Object, Object> entries : override.entrySet()) {
conf.setProperty(entries.getKey().toString(), entries.getValue().toString());
}