fixing NPE and properties issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/38ea793f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/38ea793f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/38ea793f Branch: refs/heads/docker-grouping-merge Commit: 38ea793fc598dc7c674537e823db39b1d7bf0518 Parents: 736ab44 Author: reka <[email protected]> Authored: Wed Nov 5 11:23:10 2014 +0530 Committer: reka <[email protected]> Committed: Wed Nov 5 11:23:23 2014 +0530 ---------------------------------------------------------------------- .../applications/parser/DefaultApplicationParser.java | 9 ++++++--- .../cloud/controller/impl/CloudControllerServiceImpl.java | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/38ea793f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index d6339f9..9af36ff 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -331,9 +331,12 @@ public class DefaultApplicationParser implements ApplicationParser { //properties.addProperties(property); propertyList.add(property); } - Property[] properties1 = new Property[propertyList.size()]; - properties.setProperties(propertyList.toArray(properties1)); - this.addProperties(alias, properties); + if(propertyList.size() > 0 ) { + Property[] properties1 = new Property[propertyList.size()]; + properties.setProperties(propertyList.toArray(properties1)); + this.addProperties(alias, properties); + } + } http://git-wip-us.apache.org/repos/asf/stratos/blob/38ea793f/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 fd4f172..461b449 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 @@ -1931,7 +1931,8 @@ public class CloudControllerServiceImpl implements CloudControllerService { newCluster.setStatus(ClusterStatus.Created); newCluster.setHostNames(Arrays.asList(appClusterCtxt.getHostName())); Cartridge cartridge = dataHolder.getCartridge(appClusterCtxt.getCartridgeType()); - if(cartridge.getDeployerType().equals(StratosConstants.KUBERNETES_DEPLOYER_TYPE)) { + if(cartridge.getDeployerType() != null && + cartridge.getDeployerType().equals(StratosConstants.KUBERNETES_DEPLOYER_TYPE)) { newCluster.setKubernetesCluster(true); } clusters.add(newCluster);
