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

CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name

This commit is contained in:
Kelven Yang 2013-01-28 17:12:15 -08:00
parent 7ea83b82e6
commit 8887f01b37
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/tomcatconf/componentContext.xml.in
View File

@ -109,6 +109,10 @@
<property name="name" value="Basic"/>
</bean>
<bean id="hyervisorTemplateAdapter" class="com.cloud.template.HyervisorTemplateAdapter">
<property name="name" value="HypervisorAdapter"/>
</bean>
<!--
Authenticators
-->

4
server/src/com/cloud/template/TemplateAdapterBase.java
View File

@ -87,6 +87,10 @@ public abstract class TemplateAdapterBase implements TemplateAdapter {
public String getName() {
return _name;
}
public void setName(String name) {
_name = name;
}
@Override
public boolean start() {

2
utils/src/com/cloud/utils/component/AdapterBase.java
View File

@ -54,7 +54,7 @@ public class AdapterBase implements Adapter {
public static <T extends Adapter> T getAdapterByName(List<T> adapters, String name) {
for(T adapter : adapters) {
if(adapter.getName().equalsIgnoreCase(name))
if(adapter.getName() != null && adapter.getName().equalsIgnoreCase(name))
return adapter;
}
return null;