Repository: incubator-stratos Updated Branches: refs/heads/master 3d7961ed4 -> ff227d736
Use logical AND to avoid 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/ff227d73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ff227d73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ff227d73 Branch: refs/heads/master Commit: ff227d7369eed26199cea9c111f026e9366c0188 Parents: 3d7961e Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Thu Mar 20 12:52:43 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Thu Mar 20 12:52:43 2014 +0530 ---------------------------------------------------------------------- .../stratos/rest/endpoint/bean/util/converter/PojoConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ff227d73/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 34c4eed..dcaae0c 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -71,7 +71,7 @@ public class PojoConverter { } //IaaS - if(cartridgeDefinitionBean.iaasProvider != null & !cartridgeDefinitionBean.iaasProvider.isEmpty()) { + if(cartridgeDefinitionBean.iaasProvider != null && !cartridgeDefinitionBean.iaasProvider.isEmpty()) { cartridgeConfig.setIaasConfigs(getIaasConfigsAsArray(cartridgeDefinitionBean.iaasProvider)); } //LB
