You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/01/14 04:35:42 UTC

git commit: handling a NPE

Updated Branches:
  refs/heads/master ff03b8fb5 -> 11e4b33ca


handling a NPE


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/11e4b33c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/11e4b33c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/11e4b33c

Branch: refs/heads/master
Commit: 11e4b33cac0d2e2b9cf494a07c010af16868456c
Parents: ff03b8f
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Tue Jan 14 09:04:14 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Tue Jan 14 09:04:14 2014 +0530

----------------------------------------------------------------------
 .../stratos/cloud/controller/util/CloudControllerUtil.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/11e4b33c/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 99eca34..fa2a143 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
@@ -67,7 +67,10 @@ public class CloudControllerUtil {
         cartridge.setProvider(config.getProvider());
         cartridge.setVersion(config.getVersion());
         cartridge.setBaseDir(config.getBaseDir());
-        cartridge.setPortMappings(Arrays.asList(config.getPortMappings()));
+        
+        if (config.getPortMappings() != null) {
+			cartridge.setPortMappings(Arrays.asList(config.getPortMappings()));
+		}
         
         if(config.getPersistanceMappings() != null && config.getPersistanceMappings().length >0){
         	cartridge.setPeristanceMappings(Arrays.asList(config.getPersistanceMappings()));