[Engine-patches] Change in ovirt-engine[master]: core: Fix RemoveVmTemplate regression

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: Fix RemoveVmTemplate regression
......................................................................

core: Fix RemoveVmTemplate regression

Refactoring task creation broke removing a VM template, since the
RemoveVmTemplateCommand does not propagate it's parameters to the child
commands, which causes an NPE when trying to access them. This patch
fixes this flow.

Change-Id: I27ebeee388b2975cd9a34250758a4bb954f5bd57
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java
2 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/8049/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java
index ea8698c..6325b5e 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java
@@ -46,6 +46,8 @@
                 tempVar.setEntityId(getParameters().getEntityId());
                 tempVar.setWipeAfterDelete(template.isWipeAfterDelete());
                 
tempVar.setTransactionScopeOption(TransactionScopeOption.RequiresNew);
+                tempVar.setParentCommand(getActionType());
+                tempVar.setParentParemeters(getParameters());
                 VdcReturnValueBase vdcReturnValue = 
Backend.getInstance().runInternalAction(
                                 VdcActionType.RemoveTemplateSnapshot,
                                 tempVar,
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 02ff06e..b45f286 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
@@ -9,9 +9,9 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.bll.job.ExecutionHandler;
-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.bll.utils.PermissionSubject;
+import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.action.VdcActionType;
 import org.ovirt.engine.core.common.action.VdcReturnValueBase;
 import org.ovirt.engine.core.common.action.VmTemplateParametersBase;
@@ -207,6 +207,8 @@
 
     protected boolean RemoveVmTemplateImages() {
         getParameters().setEntityId(getParameters().getEntityId());
+        getParameters().setParentCommand(getActionType());
+        getParameters().setParentParemeters(getParameters());
         VdcReturnValueBase vdcReturnValue = 
Backend.getInstance().runInternalAction(
                 VdcActionType.RemoveAllVmTemplateImageTemplates,
                 getParameters(),


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

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