Omer Frenkel has uploaded a new change for review.
Change subject: core: remove un-needed null check
......................................................................
core: remove un-needed null check
since we lock the template exclusively, and there is a null check in
can-do-action, there is no need with another check in execute.
Change-Id: Ic8b3097caf4daae52037752be196da8948641a5e
Signed-off-by: Omer Frenkel <ofren...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
1 file changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/31298/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
index b2c99a4..faf16cf 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
@@ -190,15 +190,13 @@
getVdsGroup().getcompatibility_version());
}
- if (getVmTemplate() != null) {
- getVmStaticDAO().incrementDbGeneration(getVmTemplate().getId());
- updateOriginalTemplateNameOnDerivedVms();
- UpdateVmTemplate();
- updateWatchdog(getParameters().getVmTemplateData().getId());
- updateRngDevice(getParameters().getVmTemplateData().getId());
- checkTrustedService();
- setSucceeded(true);
- }
+ getVmStaticDAO().incrementDbGeneration(getVmTemplate().getId());
+ updateOriginalTemplateNameOnDerivedVms();
+ UpdateVmTemplate();
+ updateWatchdog(getParameters().getVmTemplateData().getId());
+ updateRngDevice(getParameters().getVmTemplateData().getId());
+ checkTrustedService();
+ setSucceeded(true);
}
private void checkTrustedService() {
--
To view, visit http://gerrit.ovirt.org/31298
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8b3097caf4daae52037752be196da8948641a5e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofren...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
