apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Vmware is broken due to commit b20add810e5751f53946f695b6223a8016f104a5.

Browse Source
This commit is contained in:
Min Chen 2014-01-22 17:44:21 -08:00
parent 1b89ae7acb
commit 206c35c620
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
View File

@ -263,12 +263,12 @@ public class VmwareClient {
props.add(propertyName); props.add(propertyName);
List<ObjectContent> objContent = retrieveMoRefProperties(mor, props); List<ObjectContent> objContent = retrieveMoRefProperties(mor, props);
T propertyValue = null; Object propertyValue = null;
if (objContent != null && objContent.size() > 0) { if (objContent != null && objContent.size() > 0) {
List<DynamicProperty> dynamicProperty = objContent.get(0).getPropSet(); List<DynamicProperty> dynamicProperty = objContent.get(0).getPropSet();
if (dynamicProperty != null && dynamicProperty.size() > 0) { if (dynamicProperty != null && dynamicProperty.size() > 0) {
DynamicProperty dp = dynamicProperty.get(0); DynamicProperty dp = dynamicProperty.get(0);
propertyValue = (T)dp.getVal(); propertyValue = dp.getVal();
/* /*
* If object is ArrayOfXXX object, then get the XXX[] by * If object is ArrayOfXXX object, then get the XXX[] by
* invoking getXXX() on the object. * invoking getXXX() on the object.
@ -276,17 +276,17 @@ public class VmwareClient {
* ArrayOfManagedObjectReference.getManagedObjectReference() * ArrayOfManagedObjectReference.getManagedObjectReference()
* returns ManagedObjectReference[] array. * returns ManagedObjectReference[] array.
*/ */
Class<? extends Object> dpCls = propertyValue.getClass(); Class dpCls = propertyValue.getClass();
String dynamicPropertyName = dpCls.getName(); String dynamicPropertyName = dpCls.getName();
if (dynamicPropertyName.indexOf("ArrayOf") != -1) { if (dynamicPropertyName.indexOf("ArrayOf") != -1) {
String methodName = "get" + dynamicPropertyName.substring(dynamicPropertyName.indexOf("ArrayOf") + "ArrayOf".length(), dynamicPropertyName.length()); String methodName = "get" + dynamicPropertyName.substring(dynamicPropertyName.indexOf("ArrayOf") + "ArrayOf".length(), dynamicPropertyName.length());
Method getMorMethod = dpCls.getDeclaredMethod(methodName, (Class<?>)null); Method getMorMethod = dpCls.getDeclaredMethod(methodName, null);
propertyValue = (T)getMorMethod.invoke(propertyValue, (Object[])null); propertyValue = getMorMethod.invoke(propertyValue, (Object[])null);
} }
} }
} }
return propertyValue; return (T)propertyValue;
} }
private List<ObjectContent> retrieveMoRefProperties(ManagedObjectReference mObj, List<String> props) throws Exception { private List<ObjectContent> retrieveMoRefProperties(ManagedObjectReference mObj, List<String> props) throws Exception {