Gilad Chaplik has uploaded a new change for review. Change subject: core: NPE in remove from export domain (#847652) ......................................................................
core: NPE in remove from export domain (#847652) https://bugzilla.redhat.com/847652 While removing VM/Template from export domain, in endCommand we construct the command again and try to fetch the vm/template, which will fail (because the vm/template doesn't exist), therefore, we need a Null check there. Change-Id: I8b65227d94ba426b943181398fcd06b6137638fa Signed-off-by: Gilad Chaplik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java 2 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/7523/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java index 7de0737..c1d492f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java @@ -1,6 +1,11 @@ package org.ovirt.engine.core.bll; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.job.ExecutionHandler; @@ -14,7 +19,10 @@ import org.ovirt.engine.core.common.action.RemoveVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.common.businessentities.*; +import org.ovirt.engine.core.common.businessentities.DiskImage; +import org.ovirt.engine.core.common.businessentities.LunDisk; +import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.locks.LockingGroup; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; @@ -42,7 +50,9 @@ public RemoveVmCommand(T parameters) { super(parameters); parameters.setEntityId(getVmId()); - setStoragePoolId(getVm().getstorage_pool_id()); + if (getVm() != null) { + setStoragePoolId(getVm().getstorage_pool_id()); + } } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java index f26371a..b3f03d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java @@ -39,7 +39,9 @@ super(parameters); super.setVmTemplateId(parameters.getVmTemplateId()); parameters.setEntityId(getVmTemplateId()); - setStoragePoolId(getVmTemplate().getstorage_pool_id()); + if (getVmTemplate() != null) { + setStoragePoolId(getVmTemplate().getstorage_pool_id()); + } } public RemoveVmTemplateCommand(Guid vmTemplateId) { -- To view, visit http://gerrit.ovirt.org/7523 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b65227d94ba426b943181398fcd06b6137638fa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
