Repository: stratos Updated Branches: refs/heads/master 0b554d378 -> bf4d3c254
Update the conf util to support multiple configuration files Signed-off-by: Manula Thantriwatte <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/18aa9713 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/18aa9713 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/18aa9713 Branch: refs/heads/master Commit: 18aa9713b72d33698d953bc0f7429c6644b87850 Parents: ff5ecf1 Author: gayan <[email protected]> Authored: Wed Dec 3 19:38:33 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 4 13:48:38 2014 +0000 ---------------------------------------------------------------------- .../stratos/autoscaler/util/ConfUtil.java | 54 ++++++++++---------- 1 file changed, 28 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/18aa9713/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 9701336..8315b32 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 @@ -33,48 +33,50 @@ import java.util.HashMap; */ public class ConfUtil { - private static Log log = LogFactory.getLog(ConfUtil.class); + private static Log log = LogFactory.getLog(ConfUtil.class); - private XMLConfiguration config; + private XMLConfiguration config; //To maintain the map of config files - private static HashMap<String,ConfUtil> instanceMap=new HashMap<String, ConfUtil>(); + private static HashMap<String, ConfUtil> instanceMap = new HashMap<String, ConfUtil>(); - private ConfUtil(String configFilePath) { - try { + private ConfUtil(String configFilePath) { + try { - File confFile=new File(configFilePath); - config = new XMLConfiguration(confFile); - } catch (ConfigurationException e) { - log.error("Unable to load configuration file",e); - config = new XMLConfiguration(); // continue with default values - } - } + File confFile = new File(configFilePath); + config = new XMLConfiguration(confFile); + } catch (ConfigurationException e) { + log.error("Unable to load configuration file", e); + config = new XMLConfiguration(); // continue with default values + } + } /** * Get the instance of the configuration file + * * @param configFilePath configuration file name * @return ConfUtil instance */ - public static ConfUtil getInstance(String configFilePath) { + public static ConfUtil getInstance(String configFilePath) { - if (configFilePath == null || configFilePath.isEmpty()) { - configFilePath = Constants.AUTOSCALER_CONFIG_FILE_NAME; - } - ConfUtil instance= instanceMap.get(configFilePath); - if (instance == null) { - instance = new ConfUtil (configFilePath); - instanceMap.put(configFilePath,instance); - } - return instance; - } + if (configFilePath == null || configFilePath.isEmpty()) { + configFilePath = Constants.AUTOSCALER_CONFIG_FILE_NAME; + } + ConfUtil instance = instanceMap.get(configFilePath); + if (instance == null) { + instance = new ConfUtil(configFilePath); + instanceMap.put(configFilePath, instance); + } + return instance; + } /** * Get configurations + * * @return XMLConfiguration */ - public XMLConfiguration getConfiguration(){ - return config; - } + public XMLConfiguration getConfiguration() { + return config; + } }
