Fix null pointer exception in restore VM

apache · Apr 17, 2024 · 54c5f67 · 54c5f67
1 parent 44b8d3a
commit 54c5f67
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -7700,8 +7700,8 @@ public UserVm restoreVM(RestoreVMCmd cmd) throws InsufficientCapacityException,
         _accountMgr.checkAccess(caller, null, true, vm);
 
         DiskOffering diskOffering = rootDiskOfferingId != null ? validateAndGetDiskOffering(rootDiskOfferingId, vm, caller) : null;
-        VMTemplateVO template = _templateDao.findById(newTemplateId);
-        if (template.getSize() != null) {
+        VMTemplateVO template = _templateDao.findById(newTemplateId != null ? newTemplateId : vm.getTemplateId());
+        if (template != null && template.getSize() != null) {
             String rootDiskSize = details.get(VmDetailConstants.ROOT_DISK_SIZE);
             Long templateSize = template.getSize();
             if (StringUtils.isNumeric(rootDiskSize)) {