Martin Betak has uploaded a new change for review. Change subject: core: Fix NPE on ChangeCD with 'Down' VM ......................................................................
core: Fix NPE on ChangeCD with 'Down' VM Moved invocation of ImagesHandler.cdPathWindowsToLinux after check that assures vm is running and storage domain available. Change-Id: Ie3bf10dbeb8dd645a515dc140bd9081dc1d1acab Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1067407 Signed-off-by: Martin Betak <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/31614/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java index 20ea766..322640b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java @@ -36,12 +36,6 @@ retValue = false; } - if (retValue && !canRunActionOnNonManagedVm()) { - retValue = false; - } else { - cdImagePath = ImagesHandler.cdPathWindowsToLinux(getParameters().getCdImagePath(), getVm().getStoragePoolId(), getVm().getRunOnVds()); - } - if (retValue && !getVm().isRunningOrPaused()) { setSucceeded(false); retValue = false; @@ -54,6 +48,8 @@ addCanDoActionMessage(VdcBllMessages.VAR__ACTION__EJECT_CD); } failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, LocalizedVmStatus.from(getVm().getStatus())); + } else if (retValue && !canRunActionOnNonManagedVm()) { + retValue = false; } else if ((IsoDomainListSyncronizer.getInstance().findActiveISODomain(getVm().getStoragePoolId()) == null) && !StringUtils.isEmpty(cdImagePath)) { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CHANGE_CD); @@ -65,7 +61,10 @@ addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_INVALID_CDROM_DISK_FORMAT); setSucceeded(false); retValue = false; + } else { + cdImagePath = ImagesHandler.cdPathWindowsToLinux(getParameters().getCdImagePath(), getVm().getStoragePoolId(), getVm().getRunOnVds()); } + return retValue; } -- To view, visit http://gerrit.ovirt.org/31614 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3bf10dbeb8dd645a515dc140bd9081dc1d1acab Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
