don't repeat task tracking code between scheduled and non-scheduled code paths
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a11af34c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a11af34c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a11af34c Branch: refs/heads/master Commit: a11af34c33c69ef00adeb8906bb81d0776915c6b Parents: 438846c Author: Alex Heneveld <[email protected]> Authored: Fri Sep 8 16:00:29 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Sep 15 10:29:07 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/util/core/task/BasicExecutionManager.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a11af34c/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java index 729639d..4f8a9ec 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java @@ -401,9 +401,6 @@ public class BasicExecutionManager implements ExecutionManager { } protected Task<?> submitNewScheduledTask(final Map<?,?> flags, final ScheduledTask task) { - tasksById.put(task.getId(), task); - totalTaskCount.incrementAndGet(); - beforeSubmitScheduledTaskAllIterations(flags, task); return submitSubsequentScheduledTask(flags, task); @@ -680,9 +677,6 @@ public class BasicExecutionManager implements ExecutionManager { if (task instanceof ScheduledTask) return (Task<T>) submitNewScheduledTask(flags, (ScheduledTask)task); - tasksById.put(task.getId(), task); - totalTaskCount.incrementAndGet(); - beforeSubmitAtomicTask(flags, task); if (((TaskInternal<T>)task).getJob() == null) @@ -741,6 +735,9 @@ public class BasicExecutionManager implements ExecutionManager { for (Object tag: BrooklynTaskTags.getTagsFast(task)) { tasksWithTagCreating(tag).add(task); } + + tasksById.put(task.getId(), task); + totalTaskCount.incrementAndGet(); } protected void beforeStartScheduledTaskSubmissionIteration(Map<?,?> flags, Task<?> task) {
