Repository: brooklyn-server Updated Branches: refs/heads/master 840150c53 -> 7dd9d1ba2
Fixes potential NPE Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7dd9d1ba Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7dd9d1ba Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7dd9d1ba Branch: refs/heads/master Commit: 7dd9d1ba25b3c681efabfe911f9c1c645753ece4 Parents: 840150c Author: Svetoslav Neykov <[email protected]> Authored: Mon Jul 25 15:30:28 2016 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Mon Jul 25 15:30:28 2016 +0300 ---------------------------------------------------------------------- .../brooklyn/test/framework/TargetableTestComponentImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7dd9d1ba/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponentImpl.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponentImpl.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponentImpl.java index 9e279a2..7c011c4 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponentImpl.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponentImpl.java @@ -56,9 +56,11 @@ public abstract class TargetableTestComponentImpl extends AbstractEntity impleme public Entity resolveTarget() { Entity target = resolveTarget(getExecutionContext(), this); sensors().set(TARGET_ENTITY, target); - sensors().set(TARGET_ENTITY_ID, target.getId()); - sensors().set(TARGET_ENTITY_NAME, target.getDisplayName()); - sensors().set(TARGET_ENTITY_TYPE, target.getEntityType().getName()); + if (target != null) { + sensors().set(TARGET_ENTITY_ID, target.getId()); + sensors().set(TARGET_ENTITY_NAME, target.getDisplayName()); + sensors().set(TARGET_ENTITY_TYPE, target.getEntityType().getName()); + } return target; }
