Skip to content

Commit 4b74a99

Browse files
authored
Fix: NPE thrown on VMware to KVM migration tasks listing for removed VMs (#11892)
1 parent 2fcf962 commit 4b74a99

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

server/src/main/java/org/apache/cloudstack/vm/ImportVmTasksManagerImpl.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ private ImportVMTaskResponse createImportVMTaskResponse(ImportVMTaskVO task) {
209209
}
210210
if (task.getVmId() != null) {
211211
UserVmVO userVm = userVmDao.findById(task.getVmId());
212-
response.setVirtualMachineId(userVm.getUuid());
212+
if (userVm != null) {
213+
// Migrated VM could have been removed from CloudStack after the migration
214+
response.setVirtualMachineId(userVm.getUuid());
215+
}
213216
}
214217
response.setCreated(task.getCreated());
215218
response.setLastUpdated(task.getUpdated());

0 commit comments

Comments
 (0)