Gilad Chaplik has uploaded a new change for review. Change subject: core: NPE in remove vm from Export D (#854607) ......................................................................
core: NPE in remove vm from Export D (#854607) https://bugzilla.redhat.com/854607 when invoking remove VM/Template from export domain, we used to call validateAndSetQuota since removeVm/TemplateFromExportDomainCommand derives from RemoveVm/TemplateCommand. but in export case we don't use quota. so override quota methods to do nothing in this stage. Change-Id: I7a54bd5450a1859d892154d04300cf11d82d966d Signed-off-by: Gilad Chaplik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java 2 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/7816/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java index a9b70b8..33304b2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java @@ -136,4 +136,16 @@ } return jobProperties; } + + @Override + public boolean validateAndSetQuota() { + // no need for quota in the export domain, + // ignoring it since it inherits quotable (removeVmCommand) + return true; + } + + @Override + public void rollbackQuota() { + // see validateAndSetQuota() + } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java index 055139b..c3e1fe0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java @@ -190,4 +190,16 @@ } return jobProperties; } + + @Override + public boolean validateAndSetQuota() { + // no need for quota in the export domain, + // ignoring it since it inherits quotable (removeVmCommand) + return true; + } + + @Override + public void rollbackQuota() { + // see validateAndSetQuota() + } } -- To view, visit http://gerrit.ovirt.org/7816 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a54bd5450a1859d892154d04300cf11d82d966d 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
