Fix EntityManagementUtils.hasNoNameOrCustomKeysOrRoot
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/23543fa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/23543fa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/23543fa3 Branch: refs/heads/master Commit: 23543fa3c61f396ecac7609987592e8043505d2f Parents: 0d9372b Author: Aled Sage <[email protected]> Authored: Tue Aug 4 23:17:43 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Tue Aug 11 20:04:30 2015 +0100 ---------------------------------------------------------------------- .../java/brooklyn/management/internal/EntityManagementUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/23543fa3/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java b/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java index 046d56c..07ab79a 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagementUtils.java @@ -287,7 +287,7 @@ public class EntityManagementUtils { /** worker method to help determine whether child/children can be promoted */ @Beta //where should this live long-term? public static boolean hasNoNameOrCustomKeysOrRoot(AssemblyTemplate template, EntitySpec<?> spec) { - if (!Strings.isEmpty(template.getName())) { + if (Strings.isNonEmpty(template.getName())) { if (spec.getChildren().size()==1) { String childName = Iterables.getOnlyElement(spec.getChildren()).getDisplayName(); if (Strings.isEmpty(childName) || childName.equals(template.getName())) {
