Liron Aravot has uploaded a new change for review. Change subject: core: NPEs in AddVmTemplate.endSuccesfully after engine crash ......................................................................
core: NPEs in AddVmTemplate.endSuccesfully after engine crash AddVmTemplateCommand endSuccesfully() method had 2 NPEs after engine crash occrured. 1. VmTemplateId wasn't set after loading the async task info because of wrong setter name 2. getVm() returned null because vm id is not set per the parent command parameters. Change-Id: I12c40cd3736a0516473de223ec84301f84983d3b Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/9106/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index 20f7eb1..75bdebe 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -10,13 +10,13 @@ import org.ovirt.engine.core.bll.command.utils.StorageDomainSpaceChecker; import org.ovirt.engine.core.bll.job.ExecutionHandler; +import org.ovirt.engine.core.bll.quota.Quotable; import org.ovirt.engine.core.bll.quota.StorageQuotaValidationParameter; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; +import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.utils.VmDeviceUtils; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.bll.utils.PermissionSubject; -import org.ovirt.engine.core.bll.quota.Quotable; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddVmTemplateParameters; import org.ovirt.engine.core.common.action.CreateImageTemplateParameters; @@ -114,7 +114,7 @@ VmHandler.LockVm(vmDynamic, getCompensationContext()); setActionReturnValue(Guid.Empty); setVmTemplateId(Guid.NewGuid()); - getParameters().setVmTemplateID(getVmTemplateId()); + getParameters().setVmTemplateId(getVmTemplateId()); getParameters().setEntityId(getVmTemplateId()); TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @@ -362,7 +362,7 @@ @Override protected void endSuccessfully() { setVmTemplateId(getParameters().getVmTemplateId()); - + setVmId(((CreateImageTemplateParameters)getParameters().getImagesParameters().get(0)).getVmId()); for (VdcActionParametersBase p : getParameters().getImagesParameters()) { Backend.getInstance().EndAction(VdcActionType.CreateImageTemplate, p); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java index 54aa899..df598da 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java @@ -64,7 +64,7 @@ return privateVmTemplateID; } - public void setVmTemplateID(Guid value) { + public void setVmTemplateId(Guid value) { privateVmTemplateID = value; } -- To view, visit http://gerrit.ovirt.org/9106 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12c40cd3736a0516473de223ec84301f84983d3b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
