commit 1771c2c6c2d61c2fb4b0625c81454988cad21577
author Harikrishna Patnala <harikrishna.patnala@gmail.com> Fri Nov 26 11:59:36 2021 +0530
committer Harikrishna Patnala <harikrishna.patnala@gmail.com> Wed Dec 01 11:07:05 2021 +0530
tree 298bc8b043c8ec7252afccf053176cf34cb1406b
parent 965316b842d19c4dcb1b2028476b47f1899f7d59

Fix NPE on scale VM operation after the corresponding template is deleted

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index 1bba582..42cdb88 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3990,7 +3990,7 @@
         if (currentServiceOffering.isDynamic() && !newServiceOffering.isDynamic()) {
             removeCustomOfferingDetails(vmId);
         }
-        VMTemplateVO template = _templateDao.findById(vmForUpdate.getTemplateId());
+        VMTemplateVO template = _templateDao.findByIdIncludingRemoved(vmForUpdate.getTemplateId());
         boolean dynamicScalingEnabled = _userVmMgr.checkIfDynamicScalingCanBeEnabled(vmForUpdate, newServiceOffering, template, vmForUpdate.getDataCenterId());
         vmForUpdate.setDynamicallyScalable(dynamicScalingEnabled);
         return _vmDao.update(vmId, vmForUpdate);