From 7f0a322b7d53fe9961a1e03c93208f3c7bef69df Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Fri, 11 Feb 2022 07:36:59 -0300 Subject: [PATCH] [Vmware] Prevent NPE on template registration if guest OS is removed (#5980) --- .../storage/image/deployasis/DeployAsIsHelperImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java index 85185ef2188..326b6a3fc54 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java @@ -176,8 +176,8 @@ public class DeployAsIsHelperImpl implements DeployAsIsHelper { } else { if (StringUtils.isNotEmpty(guestOsDescription)) { for (GuestOSHypervisorVO guestOSHypervisorVO : guestOsMappings) { - GuestOSVO guestOSVO = guestOSDao.findById(guestOSHypervisorVO.getGuestOsId()); - if (guestOsDescription.equalsIgnoreCase(guestOSVO.getDisplayName())) { + GuestOSVO guestOSVO = guestOSDao.findByIdIncludingRemoved(guestOSHypervisorVO.getGuestOsId()); + if (guestOSVO != null && guestOsDescription.equalsIgnoreCase(guestOSVO.getDisplayName())) { guestOsId = guestOSHypervisorVO.getGuestOsId(); break; }