You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/10 10:49:09 UTC
stratos git commit: handling NPE when metadata keys are null in
cartride info
Repository: stratos
Updated Branches:
refs/heads/master 55cd917f1 -> 210a84bcb
handling NPE when metadata keys are null in cartride info
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/210a84bc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/210a84bc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/210a84bc
Branch: refs/heads/master
Commit: 210a84bcb1ecce9eeb8c25ed88cfdddd08162a37
Parents: 55cd917
Author: R-Rajkumar <rr...@gmail.com>
Authored: Tue Mar 10 15:18:20 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Tue Mar 10 15:18:20 2015 +0530
----------------------------------------------------------------------
.../parser/DefaultApplicationParser.java | 15 +++++++++------
.../cloud/controller/util/CloudControllerUtil.java | 7 ++++++-
2 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/210a84bc/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 64c459f..5c11738 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
@@ -365,12 +365,15 @@ public class DefaultApplicationParser implements ApplicationParser {
}
// Add metadata keys defined in cartridges as export metadata keys
- for (String str : cartridgeInfo.getMetadataKeys()) {
- if(!StringUtils.isBlank(str)) {
- exportMetadataKeys.add(cartridgeContext.getSubscribableInfoContext()
- .getAlias() + METADATA_APPENDER + str);
- }
- }
+ String[] metadataKeys = cartridgeInfo.getMetadataKeys();
+ if (metadataKeys != null) {
+ for (String str : metadataKeys) {
+ if(!StringUtils.isBlank(str)) {
+ exportMetadataKeys.add(cartridgeContext.getSubscribableInfoContext()
+ .getAlias() + METADATA_APPENDER + str);
+ }
+ }
+ }
// get hostname and cluster id
ClusterInformation clusterInfo;
http://git-wip-us.apache.org/repos/asf/stratos/blob/210a84bc/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index e114bc8..60b95eb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -112,8 +112,13 @@ public class CloudControllerUtil {
cartridge.setLoadBalancingIPType(LoadBalancingIPType.Public);
}
}
- cartridge.setMetadataKeys(config.getMetadataKeys());
+ if (config.getMetadataKeys() == null) {
+ cartridge.setMetadataKeys(new String[0]);
+ } else {
+ cartridge.setMetadataKeys(config.getMetadataKeys());
+ }
+
org.apache.stratos.common.Properties props = config.getProperties();
if (props != null) {
for (Property prop : props.getProperties()) {