Updated Branches: refs/heads/master e65e0a031 -> 419a460dc
fixing a possible NPE and adding a debug log in deployCartridgeDefinition(CartridgeConfig) method Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/419a460d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/419a460d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/419a460d Branch: refs/heads/master Commit: 419a460dc433deea78a4b25d52a7aae2ca54e964 Parents: e65e0a0 Author: Isuru <[email protected]> Authored: Wed Dec 4 23:50:56 2013 +0530 Committer: Isuru <[email protected]> Committed: Wed Dec 4 23:50:56 2013 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 4 +++ .../cloud/controller/pojo/CartridgeConfig.java | 26 ++++++++++++-------- .../cloud/controller/pojo/IaasConfig.java | 5 ++-- 3 files changed, 23 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/419a460d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 958ba46..a2999c6 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -288,6 +288,10 @@ public class CloudControllerServiceImpl implements CloudControllerService { } + if(log.isDebugEnabled()){ + log.debug("Cartridge definition: " + cartridgeConfig.toString()); + } + Cartridge cartridge = null; try { cartridge = CloudControllerUtil.toCartridge(cartridgeConfig); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/419a460d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java index 5acebc7..6435134 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java @@ -162,10 +162,12 @@ public class CartridgeConfig implements Serializable { StringBuilder deploymentDetailBuilder = new StringBuilder(); deploymentDetailBuilder.append("Base direcotry: " + baseDir); - if(deploymentDirs.length > 0) { - deploymentDetailBuilder.append(" Direcotries: "); - for (String directory : deploymentDirs) { - deploymentDetailBuilder.append(directory + " | "); + if(deploymentDirs != null) { + if(deploymentDirs.length > 0) { + deploymentDetailBuilder.append(" Direcotries: "); + for (String directory : deploymentDirs) { + deploymentDetailBuilder.append(directory + " | "); + } } } @@ -175,9 +177,11 @@ public class CartridgeConfig implements Serializable { private String getPortMappingDetails () { StringBuilder portMappingDetailBuilder = new StringBuilder(); - if(portMappings.length > 0) { - for (PortMapping portMapping : portMappings) { - portMappingDetailBuilder.append(portMapping.toString() + " | "); + if(portMappings != null) { + if(portMappings.length > 0) { + for (PortMapping portMapping : portMappings) { + portMappingDetailBuilder.append(portMapping.toString() + " | "); + } } } return portMappingDetailBuilder.toString(); @@ -186,9 +190,11 @@ public class CartridgeConfig implements Serializable { private String getIaasConfigDetails () { StringBuilder iaasConfigDetailBuilder = new StringBuilder(); - if(iaasConfigs.length > 0) { - for (IaasConfig iaasConfig : iaasConfigs) { - iaasConfigDetailBuilder.append(iaasConfig.toString() + " | "); + if(iaasConfigs != null) { + if(iaasConfigs.length > 0) { + for (IaasConfig iaasConfig : iaasConfigs) { + iaasConfigDetailBuilder.append(iaasConfig.toString() + " | "); + } } } return iaasConfigDetailBuilder.toString(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/419a460d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java index dfddde8..077deb9 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java @@ -132,8 +132,9 @@ public class IaasConfig implements Serializable { public String toString () { - return " [ Type: " + type + ", Image Id: " + imageId + ", Max Instance Limit: " + maxInstanceLimit + - " Properties: " + getIaasProperties() + " ] "; + return " [ Type: " + type + ", Name: " + name + ", Class Name: " + className + ", Image Id: " + imageId + + ", Max Instance Limit: " + maxInstanceLimit + ", Provider: " + provider + ", Identity: " + identity + + ", Credentials: " + credential + ", Properties: " + getIaasProperties() + " ] "; } private String getIaasProperties () {
