You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/12/04 14:49:59 UTC
[6/7] stratos git commit: update with the carbon configuration path
update with the carbon configuration path
Signed-off-by: Manula Thantriwatte <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bf4d3c25
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bf4d3c25
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bf4d3c25
Branch: refs/heads/master
Commit: bf4d3c25421bf9f7fc4a06eb41e2ac91b22fbcfc
Parents: ff73b13
Author: gayan <ga...@puppet.gayan.org>
Authored: Thu Dec 4 14:35:20 2014 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Thu Dec 4 13:48:39 2014 +0000
----------------------------------------------------------------------
.../org/apache/stratos/autoscaler/util/ConfUtil.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bf4d3c25/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java
index fe783ac..46d7ca0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java
@@ -45,13 +45,13 @@ public class ConfUtil {
private ConfUtil(String configFilePath) {
try {
- File confFile;
- if (configFilePath != null && !configFilePath.isEmpty()) {
- confFile = new File(configFilePath);
+ File confFile;
+ if (configFilePath != null && !configFilePath.isEmpty()) {
+ confFile = new File(configFilePath);
- } else {
- confFile = new File(CarbonUtils.getCarbonConfigDirPath(),Constants.AUTOSCALER_CONFIG_FILE_NAME);
- }
+ } else {
+ confFile = new File(CarbonUtils.getCarbonConfigDirPath(), Constants.AUTOSCALER_CONFIG_FILE_NAME);
+ }
config = new XMLConfiguration(confFile);