Arik Hadas has uploaded a new change for review. Change subject: core: fix for bz 1149135 ......................................................................
core: fix for bz 1149135 Change-Id: I7dd3475b30267c918497e4971ebd1da1cfb6e58e Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java 1 file changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/34053/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java index 8a75c15..da4198b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java @@ -61,9 +61,11 @@ super(parameters, cmdContext); parameters.setEntityInfo(new EntityInfo(VdcObjectType.VM, parameters.getVmId())); - // vm should be filled in end action - if (parameters.getVm() != null) { - setVmTemplateId(parameters.getVm().getVmtGuid()); + if (getVm() != null) { + VmTemplate latest = getVmTemplateDAO().getTemplateWithLatestVersionInChain(getVm().getVmtGuid()); + if (latest != null) { + setVmTemplate(latest); + } } } @@ -236,15 +238,11 @@ @Override protected Map<String, Pair<String, String>> getSharedLocks() { // take shared lock on latest template, since we will add vm from it - if (getVm() != null) { - VmTemplate latest = getVmTemplateDAO().getTemplateWithLatestVersionInChain(getVm().getVmtGuid()); - if (latest != null) { - setVmTemplateId(latest.getId()); - setVmTemplate(latest); - return Collections.singletonMap(latest.getId().toString(), - LockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED)); - } + if (getVmTemplateId() != null) { + return Collections.singletonMap(getVmTemplateId().toString(), + LockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED)); } + return null; } -- To view, visit http://gerrit.ovirt.org/34053 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7dd3475b30267c918497e4971ebd1da1cfb6e58e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
