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

npe guard for get host info on vmware (#11054)

Browse Source 
Co-authored-by: Daan Hoogland <dahn@apache.org>
This commit is contained in:
dahn 2025-07-17 14:25:00 +02:00 committed by GitHub
parent bf46458578
commit 714b04e3a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
View File

@ -75,7 +75,7 @@ import com.cloud.utils.Pair;
public class HostMO extends BaseMO implements VmwareHypervisorHost { public class HostMO extends BaseMO implements VmwareHypervisorHost {
private static final Logger s_logger = Logger.getLogger(HostMO.class); private static final Logger s_logger = Logger.getLogger(HostMO.class);
Map<String, VirtualMachineMO> _vmCache = new HashMap<String, VirtualMachineMO>(); Map<String, VirtualMachineMO> _vmCache = new HashMap<>();
//Map<String, String> _vmInternalNameMapCache = new HashMap<String, String>(); //Map<String, String> _vmInternalNameMapCache = new HashMap<String, String>();
@ -320,6 +320,11 @@ public class HostMO extends BaseMO implements VmwareHypervisorHost {
public VmwareHostType getHostType() throws Exception { public VmwareHostType getHostType() throws Exception {
AboutInfo aboutInfo = getHostAboutInfo(); AboutInfo aboutInfo = getHostAboutInfo();
if (aboutInfo == null) {
String msg = "no type info about host known, assuming ESXi";
s_logger.warn(msg);
return VmwareHostType.ESXi;
}
if ("VMware ESXi".equals(aboutInfo.getName())) if ("VMware ESXi".equals(aboutInfo.getName()))
return VmwareHostType.ESXi; return VmwareHostType.ESXi;
else if ("VMware ESX".equals(aboutInfo.getName())) else if ("VMware ESX".equals(aboutInfo.getName()))