Repository: stratos Updated Branches: refs/heads/master 13c400820 -> 5470cf889
Fix the NPW by adding a null check at cartridge bean conversion Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5470cf88 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5470cf88 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5470cf88 Branch: refs/heads/master Commit: 5470cf8895c17884a9e63c5f448e3c678cb0ed1c Parents: b37e842 Author: Lahiru Sandaruwan <[email protected]> Authored: Tue May 19 18:52:33 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue May 19 18:52:50 2015 +0530 ---------------------------------------------------------------------- .../stratos/rest/endpoint/util/converter/ObjectConverter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5470cf88/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 62d8c5c..9f3eb0c 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -79,9 +79,10 @@ public class ObjectConverter { cartridge.setDisplayName(cartridgeBean.getDisplayName()); cartridge.setDescription(cartridgeBean.getDescription()); cartridge.setLoadBalancingIPType(cartridgeBean.getLoadBalancingIPType()); - cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys(). - toArray(new String[cartridgeBean.getMetadataKeys().size()])); - + if(cartridgeBean.getMetadataKeys() != null) { + cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys(). + toArray(new String[cartridgeBean.getMetadataKeys().size()])); + } // deployment information if (cartridgeBean.getDeployment() != null) { cartridge.setBaseDir(cartridgeBean.getDeployment().getBaseDir());
