Maor Lipchuk has uploaded a new change for review. Change subject: core: Fix NPE when VM does not exists on register ......................................................................
core: Fix NPE when VM does not exists on register Adding a null check if the VM sent in the parameters exists or not, to prevent NPE. Change-Id: I4fb846cc16d1d208f0b96a127169f717a3fec89e Bug-Url: https://bugzilla.redhat.com/1148405 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/33868/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index a186245..1ffdc92 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -147,9 +147,10 @@ @Override protected Map<String, Pair<String, String>> getExclusiveLocks() { - if (!StringUtils.isBlank(getParameters().getVm().getName())) { + if ((getParameters().getVm() != null) && (!StringUtils.isBlank(getParameters().getVm().getName()))) { return Collections.singletonMap(getParameters().getVm().getName(), - LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM_NAME, VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED)); + LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM_NAME, + VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED)); } return null; } -- To view, visit http://gerrit.ovirt.org/33868 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4fb846cc16d1d208f0b96a127169f717a3fec89e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
