Repository: stratos Updated Branches: refs/heads/master 6ed89bbdd -> 643131f21
Fixed group deployment changes V3 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/643131f2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/643131f2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/643131f2 Branch: refs/heads/master Commit: 643131f21a067bed1c0759ef1a5167e52a6925d4 Parents: 1b3087c Author: Manula Thantriwatte <[email protected]> Authored: Tue Dec 2 11:28:25 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Dec 2 11:28:39 2014 +0000 ---------------------------------------------------------------------- .../grouping/deployer/DefaultServiceGroupDeployer.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/643131f2/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java index 286768a..891a85f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java @@ -325,6 +325,13 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { ServiceGroup[] groups = serviceGroup.getGroups(); org.apache.stratos.autoscaler.stub.pojo.Dependencies deps = serviceGroup.getDependencies(); + List<ServiceGroupDefinition> groupDefinitions = new ArrayList<ServiceGroupDefinition>(groups.length); + for (ServiceGroup group : groups) { + if (group != null) { + groupDefinitions.add(populateServiceGroupDefinitionPojo(group)); + } + } + if (deps != null) { DependencyDefinitions depsDef = new DependencyDefinitions(); String[] startupOrders = deps.getStartupOrders(); @@ -344,12 +351,12 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { } List<String> cartridgesDef = new ArrayList<String>(Arrays.asList(cartridges)); - List<ServiceGroupDefinition> subGroupsDef = new ArrayList<ServiceGroupDefinition>(groups.length); + //List<ServiceGroupDefinition> subGroupsDef = new ArrayList<ServiceGroupDefinition>(groups.length); if (cartridges[0] != null) { servicegroupDef.setCartridges(cartridgesDef); } if (groups != null) { - servicegroupDef.setGroups(subGroupsDef); + servicegroupDef.setGroups(groupDefinitions); } return servicegroupDef;
