kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billy...@apache.org
Subject kylin git commit: minor, fix KylinConfig load BCC
Date Tue, 13 Dec 2016 00:04:13 GMT
Repository: kylin
Updated Branches:
  refs/heads/yang22 43a9226a6 -> 75ded9b67


minor, fix KylinConfig load BCC


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/75ded9b6
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/75ded9b6
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/75ded9b6

Branch: refs/heads/yang22
Commit: 75ded9b6799ceb0dee95fd6c1977a32b0806806b
Parents: 43a9226
Author: Billy Liu <billyliu@apache.org>
Authored: Tue Dec 13 08:03:22 2016 +0800
Committer: Billy Liu <billyliu@apache.org>
Committed: Tue Dec 13 08:04:03 2016 +0800

----------------------------------------------------------------------
 core-common/src/main/java/org/apache/kylin/common/KylinConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/75ded9b6/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 d888fd3..acd4398 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
@@ -215,6 +215,7 @@ public class KylinConfig extends KylinConfigBase {
             FileInputStream is = new FileInputStream(propFile);
             conf.load(is);
             IOUtils.closeQuietly(is);
+            conf = BCC.check(conf);
 
             File propOverrideFile = new File(propFile.getParentFile(), propFile.getName()
+ ".override");
             if (propOverrideFile.exists()) {
@@ -222,7 +223,6 @@ public class KylinConfig extends KylinConfigBase {
                 Properties propOverride = new Properties();
                 propOverride.load(ois);
                 IOUtils.closeQuietly(ois);
-                conf = BCC.check(conf);
                 conf.putAll(BCC.check(propOverride));
             }
         } catch (IOException e) {


Mime
View raw message