Moti Asayag has uploaded a new change for review. Change subject: engine: Refactor of propagateFailure(VdcReturnValueBase) ......................................................................
engine: Refactor of propagateFailure(VdcReturnValueBase) The method will be used from few commands, therefore it is being pulled into a higher level in the hierarchy tree. Change-Id: Ie18a9b7e168d7637c98f7915f5ba93bac9970364 Signed-off-by: Moti Asayag <masa...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java 2 files changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/22395/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index 58f405b..3588e6f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -2107,4 +2107,17 @@ } super.setCorrelationId(correlationId); } + + /** + * Propagates an internal command failures into the command which invoked it + * + * @param internalReturnValue + * the return value of the internal command + */ + protected void propagateFailure(VdcReturnValueBase internalReturnValue) { + getReturnValue().getExecuteFailedMessages().addAll(internalReturnValue.getExecuteFailedMessages()); + getReturnValue().setFault(internalReturnValue.getFault()); + getReturnValue().getCanDoActionMessages().addAll(internalReturnValue.getCanDoActionMessages()); + getReturnValue().setCanDoAction(internalReturnValue.getCanDoAction()); + } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java index 5627949..ad71f80 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java @@ -53,13 +53,6 @@ return parameters; } - private void propagateFailure(VdcReturnValueBase internalReturnValue) { - getReturnValue().getExecuteFailedMessages().addAll(internalReturnValue.getExecuteFailedMessages()); - getReturnValue().setFault(internalReturnValue.getFault()); - getReturnValue().getCanDoActionMessages().addAll(internalReturnValue.getCanDoActionMessages()); - getReturnValue().setCanDoAction(internalReturnValue.getCanDoAction()); - } - protected boolean addMacToPool(String macAddress) { if (MacPoolManager.getInstance().addMac(macAddress)) { return true; -- To view, visit http://gerrit.ovirt.org/22395 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie18a9b7e168d7637c98f7915f5ba93bac9970364 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches