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

fix default templateadaptor is not injected

This commit is contained in:
Edison Su 2012-10-24 16:00:51 -07:00
parent 48c2e6b844
commit 6a7215cedc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,16 @@ public class ComponentLocator implements ComponentLocatorMBean {
_managerMap.putAll(library.getManagers());
_factories.putAll(library.getFactories());
_pluginsMap.putAll(library.getPluggableServices());
for (Entry<String, List<ComponentInfo<Adapter>>> e : library.getAdapters().entrySet()) {
if (adapters.containsKey(e.getKey())) {
s_logger.debug("Merge needed for " + e.getKey());
adapters.get(e.getKey()).addAll(e.getValue());
}
else {
adapters.put(e.getKey(), e.getValue());
}
}
// putAll overwrites existing keys, so merge instead
for (Entry<String, List<ComponentInfo<Adapter>>> e : handler.adapters.entrySet()) {
if (adapters.containsKey(e.getKey())) {