remove nil values in getservicegroup
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4f170eb4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4f170eb4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4f170eb4 Branch: refs/heads/docker-grouping-merge Commit: 4f170eb4379fd1e4bec8cc8b2416f30fee2de6bd Parents: d467dd2 Author: Udara Liyanage <[email protected]> Authored: Fri Nov 7 12:03:20 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Fri Nov 7 12:03:37 2014 +0530 ---------------------------------------------------------------------- .../grouping/deployer/DefaultServiceGroupDeployer.java | 11 +++++++---- .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4f170eb4/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 91f9257..0f1a986 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 @@ -281,7 +281,7 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { if (deps != null) { DependencyDefinitions depsDef = new DependencyDefinitions(); String [] startupOrders = deps.getStartupOrders(); - if (startupOrders != null && startupOrders.length > 0) { + if (startupOrders != null && startupOrders[0] != null) { List<String> startupOrdersDef = Arrays.asList(startupOrders); depsDef.setStartupOrders(startupOrdersDef); } @@ -292,9 +292,12 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { List<String> cartridgesDef = new ArrayList<String>(Arrays.asList(cartridges)); List<String> subGroupsDef = new ArrayList<String>(Arrays.asList(subGroups)); - - servicegroupDef.setCartridges(cartridgesDef); - servicegroupDef.setSubGroups(subGroupsDef); + if(cartridges[0] != null){ + servicegroupDef.setCartridges(cartridgesDef); + } + if(subGroups[0] != null) { + servicegroupDef.setSubGroups(subGroupsDef); + } return servicegroupDef; } http://git-wip-us.apache.org/repos/asf/stratos/blob/4f170eb4/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml index df83e3b..1b3860d 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml +++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml @@ -117,6 +117,9 @@ <value>volumes</value> <value>domains</value> <value>kubernetesHost</value> + <value>cartridges</value> + <value>subGroups</value> + <value>startupOrders</value> </list> </property> </bean>
