Skip to content

Commit fb6bcea

Browse files
Avoid null import task update on early import failure
1 parent bd86d7c commit fb6bcea

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1788,7 +1788,9 @@ protected UserVm importUnmanagedInstanceFromVmwareToKvm(DataCenter zone, Cluster
17881788
return userVm;
17891789
} catch (CloudRuntimeException e) {
17901790
logger.error(String.format("Error importing VM: %s", e.getMessage()), e);
1791-
importVmTasksManager.updateImportVMTaskErrorState(importVMTask, ImportVmTask.TaskState.Failed, e.getMessage());
1791+
if (importVMTask != null) {
1792+
importVmTasksManager.updateImportVMTaskErrorState(importVMTask, ImportVmTask.TaskState.Failed, e.getMessage());
1793+
}
17921794
ActionEventUtils.onCompletedActionEvent(userId, owner.getId(), EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_IMPORT,
17931795
cmd.getEventDescription(), null, null, 0);
17941796
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());

0 commit comments

Comments
 (0)