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 2014/07/03 11:46:55 UTC
[3/6] git commit: Fix logging on Effectors.invoke
Fix logging on Effectors.invoke
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f620b977
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f620b977
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f620b977
Branch: refs/heads/master
Commit: f620b977ba6f69c9ab72a7035345e268fc273b15
Parents: e518690
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jun 24 22:27:35 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Jun 26 15:48:43 2014 +0100
----------------------------------------------------------------------
core/src/main/java/brooklyn/entity/effector/Effectors.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f620b977/core/src/main/java/brooklyn/entity/effector/Effectors.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/effector/Effectors.java b/core/src/main/java/brooklyn/entity/effector/Effectors.java
index 46ae767..4389a47 100644
--- a/core/src/main/java/brooklyn/entity/effector/Effectors.java
+++ b/core/src/main/java/brooklyn/entity/effector/Effectors.java
@@ -117,17 +117,17 @@ public class Effectors {
" on entity " + entity+" "+
(eff2==eff ? "" : " (actually "+eff2+"/"+
(eff2 instanceof EffectorWithBody<?> ? ((EffectorWithBody<?>)eff2).getBody() : "bodyless")+")"));
- if (eff2!=null) {
- if (eff2!=eff) {
+ if (eff2 != null) {
+ if (eff2 != eff) {
if (eff2 instanceof EffectorWithBody) {
log.debug("Replacing invocation of {} on {} with {} which is the impl defined at that entity", new Object[] { eff, entity, eff2 });
return ((EffectorWithBody<T>)eff2).getBody().newTask(entity, eff2, ConfigBag.newInstance().putAll(parameters));
} else {
log.warn("Effector {} defined on {} has no body; invoking caller-supplied {} instead", new Object[] { eff2, entity, eff });
}
- } else {
- log.debug("Effector {} does not exist on {}; attempting to invoke anyway", new Object[] { eff, entity });
}
+ } else {
+ log.debug("Effector {} does not exist on {}; attempting to invoke anyway", new Object[] { eff, entity });
}
if (eff instanceof EffectorWithBody) {