Repository: kylin Updated Branches: refs/heads/KYLIN-2217-2 6a669b640 -> 643cbe955
bug fix Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/643cbe95 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/643cbe95 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/643cbe95 Branch: refs/heads/KYLIN-2217-2 Commit: 643cbe95521cee4bd4f18dc217d3c958dc145647 Parents: 6a669b6 Author: Li Yang <liy...@apache.org> Authored: Fri Nov 25 17:59:40 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Fri Nov 25 17:59:40 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfig.java | 3 ++- pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/643cbe95/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 73e5aeb..d888fd3 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 @@ -222,7 +222,8 @@ public class KylinConfig extends KylinConfigBase { Properties propOverride = new Properties(); propOverride.load(ois); IOUtils.closeQuietly(ois); - conf.putAll(propOverride); + conf = BCC.check(conf); + conf.putAll(BCC.check(propOverride)); } } catch (IOException e) { throw new RuntimeException(e); http://git-wip-us.apache.org/repos/asf/kylin/blob/643cbe95/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0501d0f..51479c8 100644 --- a/pom.xml +++ b/pom.xml @@ -1097,7 +1097,7 @@ </property> <property> <name>log4j.configuration</name> - <value>file:${pom.parent.basedir}/build/conf/kylin-tools-log4j.properties</value> + <value>file:${project.basedir}/../build/conf/kylin-tools-log4j.properties</value> </property> </systemProperties> <argLine>-javaagent:${project.build.testOutputDirectory}/jamm.jar ${argLine}</argLine>
