Repository: stratos Updated Branches: refs/heads/4.0.0-grouping fade19d79 -> 26a093993
fixing NPE when deploying group without dependencies Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/26a09399 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/26a09399 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/26a09399 Branch: refs/heads/4.0.0-grouping Commit: 26a093993e57fa21e488ed4a72e6a6f5b205ee68 Parents: fade19d Author: Martin Eppel <[email protected]> Authored: Fri Oct 10 11:07:13 2014 -0700 Committer: Martin Eppel <[email protected]> Committed: Fri Oct 10 11:07:13 2014 -0700 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/26a09399/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 72874e5..68ccc5e 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -308,17 +308,19 @@ public class CloudControllerServiceImpl implements CloudControllerService { log.debug("CloudControllerServiceImpl:deployServiceGroup:dependencies" + dependencies); } - String [] startupOrders = dependencies.getStartupOrders(); - - if(log.isDebugEnabled()) { - log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrders" + startupOrders); - - if (startupOrders != null) { - log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrder:size" + startupOrders.length); - } else { - log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrder: is null"); - } - } + if (dependencies != null) { + String [] startupOrders = dependencies.getStartupOrders(); + + if(log.isDebugEnabled()) { + log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrders" + startupOrders); + + if (startupOrders != null) { + log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrder:size" + startupOrders.length); + } else { + log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrder: is null"); + } + } + } dataHolder.addServiceGroup(servicegroup);
