From bbff967deae2fbdadcd429a3c20993ad12cfabec Mon Sep 17 00:00:00 2001
From: zhaotianshuo <zhaotianshuo@meizu.com>
Date: Mon, 13 Jun 2016 13:33:55 +0800
Subject: [PATCH] KYLIN-1781 fix config encoding error

---
 core-common/src/main/java/org/apache/kylin/common/KylinConfig.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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());
                 }
-- 
2.5.0.windows.1