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

kelveny · kelveny · commit 8887f01b3740 · 2013-01-28T17:12:41.000-08:00
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
@@ -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
   -->
diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java
@@ -87,6 +87,10 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
 	public String getName() {
 		return _name;
 	}
+	
+	public void setName(String name) {
+		_name = name;
+	}
 
 	@Override
 	public boolean start() {
diff --git a/utils/src/com/cloud/utils/component/AdapterBase.java b/utils/src/com/cloud/utils/component/AdapterBase.java
@@ -54,7 +54,7 @@ public boolean stop() {
 
     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;

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public boolean stop() {`
`54`	`54`
`55`	`55`	`public static <T extends Adapter> T getAdapterByName(List<T> adapters, String name) {`
`56`	`56`	`for(T adapter : adapters) {`
`57`		`- if(adapter.getName().equalsIgnoreCase(name))`
	`57`	`+ if(adapter.getName() != null && adapter.getName().equalsIgnoreCase(name))`
`58`	`58`	`return adapter;`
`59`	`59`	`}`
`60`	`60`	`return null;`