[Engine-patches] Change in ovirt-engine[master]: core: set action msg for ForceRemoveStorageDomain

[abonas]

Alissa Bonas has uploaded a new change for review.

Change subject: core: set action msg for ForceRemoveStorageDomain
......................................................................

core: set action msg for ForceRemoveStorageDomain

Set action message type (var action) in setActionMessageParameters
instead of setting it in canDoAction.
When setting it in canDoAction, it's initialized only after
the locks are checked, hence error message due to a lock
displays $action and not the real value  because it's initialized too late.

Change-Id: Ib5f2e1b4e525693be8cd8ce06b17be14e2f8a57c
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/15097/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
index 5a3ee06..8b8b306 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
@@ -81,7 +81,6 @@
 
     @Override
     protected boolean canDoAction() {
-        addCanDoActionMessage(VdcBllMessages.VAR__ACTION__DESTROY_DOMAIN);
         boolean returnValue =
                 super.canDoAction()
                         && checkStorageDomain()
@@ -105,4 +104,10 @@
         return 
Collections.singletonMap(getParameters().getStorageDomainId().toString(),
                 LockMessagesMatchUtil.makeLockingPair(LockingGroup.STORAGE, 
VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED));
     }
+
+    @Override
+    protected void setActionMessageParameters() {
+        super.setActionMessageParameters();
+        addCanDoActionMessage(VdcBllMessages.VAR__ACTION__DESTROY_DOMAIN);
+    }
 }


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

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