Fix null pointer exception in restore VM

apache · Apr 17, 2024 · 27bf825 · 27bf825
1 parent 44b8d3a
commit 27bf825
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -7699,8 +7699,16 @@ public UserVm restoreVM(RestoreVMCmd cmd) throws InsufficientCapacityException,
         }
         _accountMgr.checkAccess(caller, null, true, vm);
 
+        VMTemplateVO template;
+        if (newTemplateId != null) {
+            template = _templateDao.findById(newTemplateId);
+            if (template == null) {
+                throw new InvalidParameterValueException("Cannot find template with ID " + newTemplateId);
+            }
+        } else {
+            template = _templateDao.findByIdIncludingRemoved(vm.getTemplateId());
+        }
         DiskOffering diskOffering = rootDiskOfferingId != null ? validateAndGetDiskOffering(rootDiskOfferingId, vm, caller) : null;
-        VMTemplateVO template = _templateDao.findById(newTemplateId);
         if (template.getSize() != null) {
             String rootDiskSize = details.get(VmDetailConstants.ROOT_DISK_SIZE);
             Long templateSize = template.getSize();