Repository: stratos Updated Branches: refs/heads/docker-grouping-merge 226403ecd -> de74e1d6d
Fixing null check in AutoScalerServiceImpl.publishMetadata() method Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/390efc74 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/390efc74 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/390efc74 Branch: refs/heads/docker-grouping-merge Commit: 390efc747a411e4344144c368a5e996037abecdf Parents: f55d544 Author: Imesh Gunaratne <[email protected]> Authored: Tue Nov 4 17:29:05 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Nov 4 17:29:05 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/api/AutoScalerServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/390efc74/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java index ed10b50..a3f7903 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java @@ -469,8 +469,10 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { for (Map.Entry<String, Properties> entry : applicationParser.getAliasToProperties().entrySet()) { String alias = entry.getKey(); Properties properties = entry.getValue(); - for(Property property : properties.getProperties()) { - metaDataServiceClien.addPropertyToCluster(appId, alias, property.getName(), property.getValue()); + if(properties != null) { + for (Property property : properties.getProperties()) { + metaDataServiceClien.addPropertyToCluster(appId, alias, property.getName(), property.getValue()); + } } } } catch (MetaDataServiceClientException e) {
