etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix null pointer exception in restore VM (#431)

This commit is contained in:
Vishesh 2024-04-23 21:11:39 +05:30 committed by GitHub
parent e630d7afea
commit 93e66c52dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

@ -7683,8 +7683,19 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
_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.findById(vm.getTemplateId());
if (template == null) {
throw new InvalidParameterValueException("Cannot find template linked with VM");
}
}
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();