Moti Asayag has uploaded a new change for review. Change subject: engine: Add type argument to CommandBase references ......................................................................
engine: Add type argument to CommandBase references Change-Id: Ic4eb0f992a7be99ee7dc9e4a4b0c887d007c9654 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/38516/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java index b696d86..4853208 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CoCoAsyncTaskHelper.java @@ -64,7 +64,7 @@ * @return Guid of the created task. */ public Guid createTask(Guid taskId, - CommandBase command, + CommandBase<?> command, AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand, String description, @@ -99,7 +99,7 @@ */ public SPMAsyncTask concreteCreateTask( Guid taskId, - CommandBase command, + CommandBase<?> command, AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand) { AsyncTaskParameters p = @@ -109,7 +109,7 @@ return createTask(internalGetTaskType(command), p); } - public void revertTasks(CommandBase command) { + public void revertTasks(CommandBase<?> command) { if (command.getParameters().getVdsmTaskIds() != null) { // list to send to the pollTasks method ArrayList<Guid> taskIdAsList = new ArrayList<Guid>(); @@ -130,7 +130,7 @@ } } - public void cancelTasks(final CommandBase command, final Logger log) { + public void cancelTasks(final CommandBase<?> command, final Logger log) { if (command.hasTasks()) { ThreadPoolUtil.execute(new Runnable() { @Override @@ -255,7 +255,7 @@ } public AsyncTask getAsyncTask(Guid taskId, - CommandBase command, + CommandBase<?> command, AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand) { AsyncTask asyncTask = null; @@ -285,7 +285,7 @@ } public AsyncTask createAsyncTask( - CommandBase command, + CommandBase<?> command, AsyncTaskCreationInfo asyncTaskCreationInfo, VdcActionType parentCommand) { Guid parentCommandId = command.getParameters().getParentParameters() == null ? Guid.Empty : command.getParameters().getParentParameters().getCommandId(); @@ -307,7 +307,7 @@ return asyncTask; } - private CommandEntity getChildCommandEntity(CommandBase command, VdcActionType parentCommand) { + private CommandEntity getChildCommandEntity(CommandBase<?> command, VdcActionType parentCommand) { CommandEntity cmdEntity = coco.getCommandEntity(command.getCommandId()); if (cmdEntity == null) { command.persistCommand(parentCommand, command.getCallBack() != null); @@ -367,7 +367,7 @@ * {@link UnsupportedOperationException} * */ - private AsyncTaskType internalGetTaskType(CommandBase command) { + private AsyncTaskType internalGetTaskType(CommandBase<?> command) { if (command.hasTaskHandlers()) { if (command.getParameters().getExecutionReason() == VdcActionParametersBase.CommandExecutionReason.REGULAR_FLOW) { return command.getCurrentTaskHandler().getTaskType(); -- To view, visit https://gerrit.ovirt.org/38516 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4eb0f992a7be99ee7dc9e4a4b0c887d007c9654 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
