Omer Frenkel has uploaded a new change for review. Change subject: core: fix NPE for removing non existing template ......................................................................
core: fix NPE for removing non existing template the locking message assume the template being removed exist in the db, therefor NPE can be thrown there. added a null check and using old message in case template doesnt exist. Change-Id: Id3eeb1d34d4e6320961ee8b360715b29003f1a68 Signed-off-by: Omer Frenkel <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/14712/1 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 4806711..cae2d74 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 @@ -216,9 +216,12 @@ } private String getTemplateExclusiveLockMessage() { - return new StringBuilder(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_IS_BEING_REMOVED.name()) - .append(String.format("$TemplateName %1$s", getVmTemplate().getName())) - .toString(); + if (getVmTemplate() != null) { + return new StringBuilder(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_IS_BEING_REMOVED.name()) + .append(String.format("$TemplateName %1$s", getVmTemplate().getName())) + .toString(); + } + return VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED.name(); } private void RemoveTemplateFromDb() { -- To view, visit http://gerrit.ovirt.org/14712 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3eeb1d34d4e6320961ee8b360715b29003f1a68 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Omer Frenkel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
