Repository: incubator-brooklyn Updated Branches: refs/heads/master 5a6c4c964 -> 861b86a38
fix DynamicFabricImpl so it accepts locations in yaml instead of as parameter to start Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ab68125a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ab68125a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ab68125a Branch: refs/heads/master Commit: ab68125a2a5a73e0dc1dde47306f819a349f3770 Parents: bf07fe1 Author: Alex Heneveld <[email protected]> Authored: Mon Apr 13 13:37:20 2015 -0500 Committer: Alex Heneveld <[email protected]> Committed: Mon Apr 13 13:37:45 2015 -0500 ---------------------------------------------------------------------- .../java/brooklyn/entity/group/DynamicFabricImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ab68125a/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java index 51e8a4c..894027e 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java @@ -110,13 +110,17 @@ public class DynamicFabricImpl extends AbstractGroupImpl implements DynamicFabri } @Override - public void start(Collection<? extends Location> locations) { - Preconditions.checkNotNull(locations, "locations must be supplied"); - Preconditions.checkArgument(locations.size() >= 1, "One or more location must be supplied"); - addLocations(locations); + public void start(Collection<? extends Location> locsO) { + if (locsO!=null) { + addLocations(locsO); + } - List<Location> newLocations = MutableList.copyOf(locations); + List<Location> newLocations = MutableList.copyOf(locsO); if (newLocations.isEmpty()) newLocations.addAll(getLocations()); + + Preconditions.checkNotNull(newLocations, "locations must be supplied"); + Preconditions.checkArgument(newLocations.size() >= 1, "One or more locations must be supplied"); + int locIndex = 0; ServiceStateLogic.setExpectedState(this, Lifecycle.STARTING);
