You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/10/03 14:23:51 UTC
[14/35] brooklyn-server git commit: remove interim TODO comments
about checking that things work
remove interim TODO comments about checking that things work
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a341cced
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a341cced
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a341cced
Branch: refs/heads/master
Commit: a341cceddb303d0076b9632b3fa64e3a7ffaa4f9
Parents: 18a908b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 12 17:36:28 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 15 10:29:09 2017 +0100
----------------------------------------------------------------------
.../brooklyn/util/core/task/BasicExecutionManager.java | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a341cced/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 0f666ba..bed08e7 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
@@ -636,13 +636,12 @@ public class BasicExecutionManager implements ExecutionManager {
}
}
- // no longer run listeners when we say to cancel, they get run when the task really ends
- // TODO confirm no problems (added 2017-09)
-// ((TaskInternal<?>)task).runListeners();
+ // note: as of 2017-09 no longer run listeners when we say to cancel, they get run when the task really ends
return result;
}
}
+ // NB: intended to be run by task.runListeners, used to run any listeners the manager wants
private final class SubmissionListenerToCallManagerListeners<T> implements Runnable {
private final Task<T> task;
@@ -652,13 +651,6 @@ public class BasicExecutionManager implements ExecutionManager {
@Override
public void run() {
- // TODO remove after confirmation this is fine; this listener runs as one of the task's listeners
- // so the task.runListeners will always be no-op
-// try {
-// ((TaskInternal<?>)task).runListeners();
-// } catch (Exception e) {
-// log.warn("Error running task listeners for task "+task+" done", e);
-// }
for (ExecutionListener listener : listeners) {
try {