You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/06/09 17:49:41 UTC
[2/5] incubator-brooklyn git commit: Tidy warnings in
RebindExceptionHandlerImpl
Tidy warnings in RebindExceptionHandlerImpl
- Previous warning (“returning null”) didn’t make sense when read in a
log, out of the context of the individual method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1c689909
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1c689909
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1c689909
Branch: refs/heads/master
Commit: 1c689909ff7ea92a218dbb03e9721e99507c54b9
Parents: 52478ec
Author: Aled Sage <al...@gmail.com>
Authored: Thu Jun 4 22:43:41 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Jun 8 11:50:56 2015 +0100
----------------------------------------------------------------------
.../entity/rebind/RebindExceptionHandlerImpl.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1c689909/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java
index afa46b0..ee35d68 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java
@@ -173,7 +173,7 @@ public class RebindExceptionHandlerImpl implements RebindExceptionHandler {
if (danglingRefFailureMode == RebindManager.RebindFailureMode.FAIL_FAST) {
throw new IllegalStateException("No entity found with id "+id);
} else {
- warn("No entity found with id "+id+"; returning null");
+ warn("No entity found with id "+id+"; dangling reference on rebind");
return null;
}
}
@@ -184,7 +184,7 @@ public class RebindExceptionHandlerImpl implements RebindExceptionHandler {
if (danglingRefFailureMode == RebindManager.RebindFailureMode.FAIL_FAST) {
throw new IllegalStateException("No location found with id "+id);
} else {
- warn("No location found with id "+id+"; returning null");
+ warn("No location found with id "+id+"; dangling reference on rebind");
return null;
}
}
@@ -195,7 +195,7 @@ public class RebindExceptionHandlerImpl implements RebindExceptionHandler {
if (danglingRefFailureMode == RebindManager.RebindFailureMode.FAIL_FAST) {
throw new IllegalStateException("No policy found with id "+id);
} else {
- warn("No policy found with id "+id+"; returning null");
+ warn("No policy found with id "+id+"; dangling reference on rebind");
return null;
}
}
@@ -206,7 +206,7 @@ public class RebindExceptionHandlerImpl implements RebindExceptionHandler {
if (danglingRefFailureMode == RebindManager.RebindFailureMode.FAIL_FAST) {
throw new IllegalStateException("No enricher found with id "+id);
} else {
- warn("No enricher found with id "+id+"; returning null");
+ warn("No enricher found with id "+id+"; dangling reference on rebind");
return null;
}
}
@@ -217,7 +217,7 @@ public class RebindExceptionHandlerImpl implements RebindExceptionHandler {
if (danglingRefFailureMode == RebindManager.RebindFailureMode.FAIL_FAST) {
throw new IllegalStateException("No feed found with id "+id);
} else {
- warn("No feed found with id "+id+"; returning null");
+ warn("No feed found with id "+id+"; dangling reference on rebind");
return null;
}
}
@@ -228,7 +228,7 @@ public class RebindExceptionHandlerImpl implements RebindExceptionHandler {
if (danglingRefFailureMode == RebindManager.RebindFailureMode.FAIL_FAST) {
throw new IllegalStateException("No catalog item found with id "+id);
} else {
- warn("No catalog item found with id "+id+"; returning null");
+ warn("No catalog item found with id "+id+"; dangling reference on rebind");
return null;
}
}