You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/07/01 10:31:57 UTC
kylin git commit: minor refactor on KylinConfig
Repository: kylin
Updated Branches:
refs/heads/master bf9c18c7c -> 561cd0b98
minor refactor on KylinConfig
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/561cd0b9
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/561cd0b9
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/561cd0b9
Branch: refs/heads/master
Commit: 561cd0b98c050c66a3ef7e7d73df9670b48055c8
Parents: bf9c18c
Author: Li Yang <li...@apache.org>
Authored: Fri Jul 1 18:31:49 2016 +0800
Committer: Li Yang <li...@apache.org>
Committed: Fri Jul 1 18:31:49 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/common/KylinConfig.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/561cd0b9/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 1b68bb6..b73e5fa 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
@@ -174,7 +174,7 @@ public class KylinConfig extends KylinConfigBase {
return config;
}
- private static File getKylinProperties() {
+ static File getKylinPropertiesFile() {
String kylinConfHome = System.getProperty(KYLIN_CONF);
if (!StringUtils.isEmpty(kylinConfHome)) {
logger.info("Use KYLIN_CONF=" + kylinConfHome);
@@ -193,7 +193,7 @@ public class KylinConfig extends KylinConfigBase {
}
public static InputStream getKylinPropertiesAsInputStream() {
- File propFile = getKylinProperties();
+ File propFile = getKylinPropertiesFile();
if (propFile == null || !propFile.exists()) {
logger.error("fail to locate kylin.properties");
throw new RuntimeException("fail to locate kylin.properties");
@@ -337,7 +337,7 @@ public class KylinConfig extends KylinConfigBase {
}
public static void writeOverrideProperties(Properties properties) throws IOException {
- File propFile = getKylinProperties();
+ File propFile = getKylinPropertiesFile();
File overrideFile = new File(propFile.getParentFile(), propFile.getName() + ".override");
overrideFile.createNewFile();
FileInputStream fis2 = null;