Repository: incubator-brooklyn Updated Branches: refs/heads/master 40edb8b51 -> fc720ef3f
LocationTransformer: generate correct location spec strings from 'Maybe' values Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d1e4637e Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d1e4637e Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d1e4637e Branch: refs/heads/master Commit: d1e4637eb19fdf912d804870a06840f3f3982998 Parents: eab2d39 Author: Alasdair Hodge <[email protected]> Authored: Tue Feb 24 10:49:28 2015 +0000 Committer: Alasdair Hodge <[email protected]> Committed: Tue Feb 24 10:49:43 2015 +0000 ---------------------------------------------------------------------- .../main/java/brooklyn/rest/transform/LocationTransformer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d1e4637e/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java b/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java index accb59a..fbf0b7d 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java @@ -36,6 +36,7 @@ import brooklyn.rest.domain.LocationSummary; import brooklyn.rest.util.WebResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; +import brooklyn.util.guava.Maybe; import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; @@ -138,7 +139,9 @@ public class LocationTransformer { // walk parent locations // TODO not sure this is the best strategy, or if it's needed, as the spec config is inherited anyway... if (spec==null) { - spec = Strings.toString( ((LocationInternal)lp).config().getRaw(LocationInternal.ORIGINAL_SPEC) ); + Maybe<Object> originalSpec = ((LocationInternal)lp).config().getRaw(LocationInternal.ORIGINAL_SPEC); + if (originalSpec.isPresent()) + spec = Strings.toString(originalSpec.get()); } if (specId==null) { LocationDefinition ld = null;
