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] Prevent NPE on template registration if guest OS is removed (#5980)

Browse Source
This commit is contained in:
Nicolas Vazquez 2022-02-11 07:36:59 -03:00 committed by GitHub
parent 212a4dedfc
commit 7f0a322b7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java
View File

@ -176,8 +176,8 @@ public class DeployAsIsHelperImpl implements DeployAsIsHelper {
} else { } else {
if (StringUtils.isNotEmpty(guestOsDescription)) { if (StringUtils.isNotEmpty(guestOsDescription)) {
for (GuestOSHypervisorVO guestOSHypervisorVO : guestOsMappings) { for (GuestOSHypervisorVO guestOSHypervisorVO : guestOsMappings) {
GuestOSVO guestOSVO = guestOSDao.findById(guestOSHypervisorVO.getGuestOsId()); GuestOSVO guestOSVO = guestOSDao.findByIdIncludingRemoved(guestOSHypervisorVO.getGuestOsId());
if (guestOsDescription.equalsIgnoreCase(guestOSVO.getDisplayName())) { if (guestOSVO != null && guestOsDescription.equalsIgnoreCase(guestOSVO.getDisplayName())) {
guestOsId = guestOSHypervisorVO.getGuestOsId(); guestOsId = guestOSHypervisorVO.getGuestOsId();
break; break;
} }