You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/11/04 12:59:22 UTC
[1/2] git commit: Fixing null check in
AutoScalerServiceImpl.publishMetadata() method
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 <im...@apache.org>
Authored: Tue Nov 4 17:29:05 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
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) {
[2/2] git commit: Merge remote-tracking branch
'origin/docker-grouping-merge' into docker-grouping-merge
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/docker-grouping-merge' into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/de74e1d6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/de74e1d6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/de74e1d6
Branch: refs/heads/docker-grouping-merge
Commit: de74e1d6da94f673fec72028a67a81b07e9ca730
Parents: 390efc7 226403e
Author: Imesh Gunaratne <im...@apache.org>
Authored: Tue Nov 4 17:29:16 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue Nov 4 17:29:16 2014 +0530
----------------------------------------------------------------------
.../deployment/policy/DeploymentPolicy.java | 6 +-
.../AutoscalerTopologyEventReceiver.java | 105 +++++++++++--------
.../status/checker/StatusChecker.java | 22 +++-
3 files changed, 84 insertions(+), 49 deletions(-)
----------------------------------------------------------------------