Skip to content

Commit afeae99

Browse files
improved errorlog message by adding null check
1 parent 3f6866d commit afeae99

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ public void updateImportVMTaskStep(ImportVmTask importVMTask, DataCenter zone, A
161161

162162
@Override
163163
public void updateImportVMTaskErrorState(ImportVmTask importVMTask, ImportVmTask.TaskState state, String errorMsg) {
164+
if (importVMTask == null) {
165+
return;
166+
}
164167
ImportVMTaskVO importVMTaskVO = (ImportVMTaskVO) importVMTask;
165168
Date updatedDate = DateUtil.now();
166169
importVMTaskVO.setUpdated(updatedDate);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,9 @@ protected UserVm importUnmanagedInstanceFromVmwareToKvm(DataCenter zone, Cluster
17771777
return userVm;
17781778
} catch (CloudRuntimeException e) {
17791779
logger.error(String.format("Error importing VM: %s", e.getMessage()), e);
1780-
importVmTasksManager.updateImportVMTaskErrorState(importVMTask, ImportVmTask.TaskState.Failed, e.getMessage());
1780+
if (importVMTask != null) {
1781+
importVmTasksManager.updateImportVMTaskErrorState(importVMTask, ImportVmTask.TaskState.Failed, e.getMessage());
1782+
}
17811783
ActionEventUtils.onCompletedActionEvent(userId, owner.getId(), EventVO.LEVEL_ERROR, EventTypes.EVENT_VM_IMPORT,
17821784
cmd.getEventDescription(), null, null, 0);
17831785
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());

0 commit comments

Comments
 (0)