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

bug 7218: Alex fixed componets locator 

status 7218: resolved fixed
This commit is contained in:
alena 2010-11-19 11:24:36 -08:00
parent ae1274e976
commit 8ca10c91bd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,7 +185,9 @@ public class ComponentLocator implements ComponentLocatorMBean {
startDaos(); // daos should not be using managers and adapters.
instantiateAdapters(adapters);
instantiateManagers();
_component = createInstance(handler.componentClass, true, true);
if (handler.componentClass != null) {
_component = createInstance(handler.componentClass, true, true);
}
configureManagers();
configureAdapters();
startManagers();
@ -840,11 +842,13 @@ public class ComponentLocator implements ComponentLocatorMBean {
parse = true;
parent = getAttribute(atts, "extends");
String implementationClass = getAttribute(atts, "class");
try {
componentClass = Class.forName(implementationClass);
} catch (ClassNotFoundException e) {
throw new CloudRuntimeException("Unable to find " + implementationClass, e);
if (implementationClass != null) {
try {
componentClass = Class.forName(implementationClass);
} catch (ClassNotFoundException e) {
throw new CloudRuntimeException("Unable to find " + implementationClass, e);
}
}
library = getAttribute(atts, "library");