You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ha...@apache.org on 2021/12/01 05:38:57 UTC
[cloudstack] branch FixScaleVMNPE_416 created (now 1771c2c)
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a change to branch FixScaleVMNPE_416
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
at 1771c2c Fix NPE on scale VM operation after the corresponding template is deleted
This branch includes the following new commits:
new 1771c2c Fix NPE on scale VM operation after the corresponding template is deleted
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[cloudstack] 01/01: Fix NPE on scale VM operation after the corresponding template is deleted
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a commit to branch FixScaleVMNPE_416
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 1771c2c6c2d61c2fb4b0625c81454988cad21577
Author: Harikrishna Patnala <ha...@gmail.com>
AuthorDate: Fri Nov 26 11:59:36 2021 +0530
Fix NPE on scale VM operation after the corresponding template is deleted
---
.../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 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 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
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);