Skip to content

Commit 9b2a83d

Browse files
committed
handle NPE when a host does not have any VMs
1 parent 371188b commit 9b2a83d

File tree

1 file changed

+4
-0
lines changed
  • vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo

1 file changed

+4
-0
lines changed

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.vmware.vim25.RetrieveResult;
3434

3535
import java.lang.reflect.InvocationTargetException;
36+
import java.util.ArrayList;
3637
import java.util.List;
3738

3839
public class BaseMO {
@@ -65,6 +66,9 @@ protected static Pair<String, List<ObjectContent>> createReturnObjectPair(Retrie
6566
if (s_logger.isDebugEnabled()) {
6667
s_logger.debug("vmware result : " + ReflectionToStringBuilderUtils.reflectCollection(result));
6768
}
69+
if (result == null) {
70+
return new Pair<>(null, new ArrayList<>());
71+
}
6872
String tokenForRetrievingNewResults = result.getToken();
6973
List<ObjectContent> listOfObjects = result.getObjects();
7074
return new Pair<>(tokenForRetrievingNewResults, listOfObjects);

0 commit comments

Comments
 (0)