From 24726864ecc36f0c17686a1d29b7b1c38bd0788d Mon Sep 17 00:00:00 2001
From: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com>
Date: Wed, 1 Dec 2021 11:06:40 +0530
Subject: [PATCH] Revert "Fix NPE on scale VM operation after the corresponding
 template is deleted (#5721)"

This reverts commit 895f282d9a122bec83a210df53e30c3e5a86201d.
---
 .../src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 31bc051731c..0c8736bbe71 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3808,7 +3808,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         if (currentServiceOffering.isDynamic() && !newServiceOffering.isDynamic()) {
             removeCustomOfferingDetails(vmId);
         }
-        VMTemplateVO template = _templateDao.findByIdIncludingRemoved(vmForUpdate.getTemplateId());
+        VMTemplateVO template = _templateDao.findById(vmForUpdate.getTemplateId());
         boolean dynamicScalingEnabled = _userVmMgr.checkIfDynamicScalingCanBeEnabled(vmForUpdate, newServiceOffering, template, vmForUpdate.getDataCenterId());
         vmForUpdate.setDynamicallyScalable(dynamicScalingEnabled);
         return _vmDao.update(vmId, vmForUpdate);