Updated Branches: refs/heads/master 3a5b5d056 -> cd3ba7812
deployment dirs can be null Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cd3ba781 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cd3ba781 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cd3ba781 Branch: refs/heads/master Commit: cd3ba781221620fd4316265883427ff1739be2cd Parents: 3a5b5d0 Author: Nirmal Fernando <[email protected]> Authored: Thu Dec 12 15:28:43 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Dec 12 15:30:18 2013 +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/cd3ba781/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 04f2b46..b905404 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 @@ -60,7 +60,10 @@ public class CloudControllerUtil { cartridge.setDisplayName(config.getDisplayName()); cartridge.setDescription(config.getDescription()); cartridge.setHostName(config.getHostName()); - cartridge.setDeploymentDirs(Arrays.asList(config.getDeploymentDirs())); + String[] deploymentDirs = config.getDeploymentDirs(); + if(deploymentDirs != null) { + cartridge.setDeploymentDirs(Arrays.asList(deploymentDirs)); + } cartridge.setProvider(config.getProvider()); cartridge.setVersion(config.getVersion()); cartridge.setBaseDir(config.getBaseDir());
