vmware: fix potential NPE when memory hotplug capability is checked (apache#3362)

yadvr · web-flow · commit 8c387f9de6d7 · 2019-05-31T10:27:36.000+05:30
This fixes potential NPE case when memory hotpluggability is checked
based on the guest OS descriptor.

Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -3281,7 +3281,7 @@ public boolean isMemoryHotAddSupported(String guestOsId) throws Exception {
         virtualHardwareVersion = getVirtualHardwareVersion();
 
         // Check if guest operating system supports memory hotadd
-        if (guestOsDescriptor.isSupportsMemoryHotAdd()) {
+        if (guestOsDescriptor != null && guestOsDescriptor.isSupportsMemoryHotAdd()) {
             guestOsSupportsMemoryHotAdd = true;
         }
         // Check if virtual machine is using hardware version 7 or later.

Original file line number	Diff line number	Diff line change
`@@ -3281,7 +3281,7 @@ public boolean isMemoryHotAddSupported(String guestOsId) throws Exception {`
`3281`	`3281`	`virtualHardwareVersion = getVirtualHardwareVersion();`
`3282`	`3282`
`3283`	`3283`	`// Check if guest operating system supports memory hotadd`
`3284`		`- if (guestOsDescriptor.isSupportsMemoryHotAdd()) {`
	`3284`	`+ if (guestOsDescriptor != null && guestOsDescriptor.isSupportsMemoryHotAdd()) {`
`3285`	`3285`	`guestOsSupportsMemoryHotAdd = true;`
`3286`	`3286`	`}`
`3287`	`3287`	`// Check if virtual machine is using hardware version 7 or later.`