Daniel Erez has uploaded a new change for review. Change subject: core: Fix NPE in LiveMigrateVmDisksCommand ......................................................................
core: Fix NPE in LiveMigrateVmDisksCommand Commit ed336c64b281bac151cb365f84668f401f272afa removes 'setStoragePoolId(getVm().getStoragePoolId())' from getPermissionCheckSubjects() since it's not needed for perms check anymore. Hence, added it back in canDoAction to prevent NPE on canDo validations. Change-Id: Ic64bddc52fa5c1745c6064c8243f8c4e7921ef22 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/15061/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java index 70b8231..cc5b092 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java @@ -193,6 +193,8 @@ @Override protected boolean canDoAction() { + setStoragePoolId(getVm().getStoragePoolId()); + if (!isValidParametersList() || !checkImagesStatus() || !isValidSpaceRequirements()) { return false; } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java index 750e10d..67d9a22 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java @@ -89,6 +89,7 @@ @Test public void canDoActionNoDisksSpecified() { + initVm(VMStatus.Up, Guid.NewGuid(), null); assertFalse(command.canDoAction()); assertTrue(command.getReturnValue() .getCanDoActionMessages() @@ -168,7 +169,9 @@ VM vm = new VM(); vm.setStatus(vmStatus); vm.setRunOnVds(runOnVds); + vm.setStoragePoolId(storagePoolId); + doReturn(vm).when(command).getVm(); when(vmDao.get(any(Guid.class))).thenReturn(vm); when(vmDao.getVmsListForDisk(diskImageId)).thenReturn(Collections.singletonList(vm)); } -- To view, visit http://gerrit.ovirt.org/15061 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic64bddc52fa5c1745c6064c8243f8c4e7921ef22 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
