[Engine-patches] Change in ovirt-engine[master]: core : Fix for HibernateVm command

[rnori]

Ravi Nori has uploaded a new change for review.

Change subject: core : Fix for HibernateVm command
......................................................................

core : Fix for HibernateVm command

HibernateVm command needed this fix in CommandAsyncTask for endAction
to work

Change-Id: I529b7b4222e76f87e98b6807a89046a71fb8c938
Signed-off-by: Ravi Nori <rn...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.java
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/15444/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.java
index ef8800a..ad1e029 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandAsyncTask.java
@@ -142,7 +142,7 @@
                 }
 
                 vdcReturnValue =
-                        
Backend.getInstance().endAction(dbAsyncTask.getActionParameters().getCommandType(),
+                        
Backend.getInstance().endAction(getEndActionType(dbAsyncTask),
                                 dbAsyncTask.getActionParameters(),
                                 new CommandContext(context));
             } catch (VdcBLLException ex) {
@@ -166,6 +166,14 @@
         }
     }
 
+    private VdcActionType getEndActionType(AsyncTasks dbAsyncTask) {
+        VdcActionType commandType = 
dbAsyncTask.getActionParameters().getCommandType();
+        if (!VdcActionType.Unknown.equals(commandType)) {
+            return commandType;
+        }
+        return dbAsyncTask.getaction_type();
+    }
+
     private String getErrorMessage() {
         return String.format("[within thread]: EndAction for action type %1$s 
threw an exception.",
                 
getParameters().getDbAsyncTask().getActionParameters().getCommandType());


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

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