etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix components.xml handling in agent

This commit is contained in:
Chiradeep Vittal 2010-11-17 11:02:04 -08:00
parent 59b07f8047
commit 43d5219258
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/src/com/cloud/utils/component/ComponentLocator.java
View File

@ -113,17 +113,18 @@ public class ComponentLocator implements ComponentLocatorMBean {
try {
SAXParserFactory spfactory = SAXParserFactory.newInstance();
SAXParser saxParser = spfactory.newSAXParser();
_daoMap = new LinkedHashMap<String, ComponentInfo<GenericDao<?, ? extends Serializable>>>();
_managerMap = new LinkedHashMap<String, ComponentInfo<Manager>>();
_adapterMap = new HashMap<String, Adapters<? extends Adapter>>();
File file = PropertiesUtil.findConfigFile(filename);
if (file == null) {
throw new CloudRuntimeException("Unable to find " + filename);
return null;
}
s_logger.info("Config file found at " + file.getAbsolutePath() + ". Configuring " + _serverName);
XmlHandler handler = new XmlHandler(_serverName);
saxParser.parse(file, handler);
_daoMap = new LinkedHashMap<String, ComponentInfo<GenericDao<?, ? extends Serializable>>>();
_managerMap = new LinkedHashMap<String, ComponentInfo<Manager>>();
_adapterMap = new HashMap<String, Adapters<? extends Adapter>>();
if (handler.parent != null) {
String[] tokens = handler.parent.split(":");
String parentFile = filename;
@ -173,6 +174,10 @@ public class ComponentLocator implements ComponentLocatorMBean {
protected void parse(String filename) {
Pair<XmlHandler, ComponentLibrary> parseResults = parse2(filename);
if (parseResults == null) {
s_logger.info("Skipping configuration using components.xml");
return;
}
XmlHandler handler = parseResults.first();
ComponentLibrary library = parseResults.second();