[Engine-patches] Change in ovirt-engine[master]: core: avoid NPE on UpdateVM template command

[laravot]

Liron Aravot has uploaded a new change for review.

Change subject: core: avoid NPE on UpdateVM template command
......................................................................

core: avoid NPE on UpdateVM template command

When trying to update a template which was deleted, an NPE can occur
whent trying to load the template disks from DB.

Change-Id: I6788f10a6faef632f7ef13f39a85ede9f4fdb696
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/10545/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 e0ba2bd..c1b1a5f 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
@@ -39,8 +39,8 @@
             return 
failCanDoAction(VdcBllMessages.VMT_CANNOT_EDIT_BLANK_TEMPLATE);
         }
         mOldTemplate = 
DbFacade.getInstance().getVmTemplateDao().get(getVmTemplate().getId());
-        VmTemplateHandler.UpdateDisksFromDb(mOldTemplate);
         if (mOldTemplate != null) {
+            VmTemplateHandler.UpdateDisksFromDb(mOldTemplate);
             if (!StringUtils.equals(mOldTemplate.getname(), 
getVmTemplate().getname())
                     && isVmTemlateWithSameNameExist(getVmTemplateName())) {
                 
addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_CREATE_DUPLICATE_NAME);


--
To view, visit http://gerrit.ovirt.org/10545
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6788f10a6faef632f7ef13f39a85ede9f4fdb696
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Aravot <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches