Repository: kylin Updated Branches: refs/heads/master d11d019c9 -> e39333812
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/e3933381 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e3933381 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e3933381 Branch: refs/heads/master Commit: e393338124302f60ff6e85e5fdc2e8cb806696f5 Parents: d11d019 Author: Billy Liu <billy...@apache.org> Authored: Tue Dec 13 08:03:22 2016 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Tue Dec 13 08:03:22 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/e3933381/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) {
