Fixing NPE in object conversion logic
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d5b4136c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d5b4136c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d5b4136c Branch: refs/heads/master Commit: d5b4136cf008cd1de65ed55fb9516cd21e932d11 Parents: 363dd6e Author: Imesh Gunaratne <[email protected]> Authored: Tue Dec 16 09:09:57 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Dec 18 12:06:56 2014 +0530 ---------------------------------------------------------------------- .../endpoint/util/converter/PojoConverter.java | 36 +++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d5b4136c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java index 2df88e6..a4b19c7 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java @@ -1124,16 +1124,18 @@ public class PojoConverter { List<GroupDefinition> groupDefinitions = new ArrayList<GroupDefinition>(); if(groupContexts != null) { for (GroupContext groupContext : groupContexts) { - GroupDefinition groupDefinition = new GroupDefinition(); - groupDefinition.setAlias(groupContext.getAlias()); - groupDefinition.setGroupMaxInstances(groupContext.getGroupMaxInstances()); - groupDefinition.setGroupMinInstances(groupContext.getGroupMinInstances()); - groupDefinition.setGroupScalingEnabled(groupContext.getGroupScalingEnabled()); - groupDefinition.setName(groupContext.getName()); - groupDefinition.setGroups(convertGroupContextsToGroupDefinitions(groupContext.getGroupContexts())); - groupDefinition.setCartridges(convertCartridgeContextsToCartridgeDefinitions( - groupContext.getCartridgeContexts())); - groupDefinitions.add(groupDefinition); + if(groupContext != null) { + GroupDefinition groupDefinition = new GroupDefinition(); + groupDefinition.setAlias(groupContext.getAlias()); + groupDefinition.setGroupMaxInstances(groupContext.getGroupMaxInstances()); + groupDefinition.setGroupMinInstances(groupContext.getGroupMinInstances()); + groupDefinition.setGroupScalingEnabled(groupContext.getGroupScalingEnabled()); + groupDefinition.setName(groupContext.getName()); + groupDefinition.setGroups(convertGroupContextsToGroupDefinitions(groupContext.getGroupContexts())); + groupDefinition.setCartridges(convertCartridgeContextsToCartridgeDefinitions( + groupContext.getCartridgeContexts())); + groupDefinitions.add(groupDefinition); + } } } return groupDefinitions; @@ -1164,12 +1166,14 @@ public class PojoConverter { List<CartridgeDefinition> cartridgeDefinitions = new ArrayList<CartridgeDefinition>(); if(cartridgeContexts != null) { for (CartridgeContext cartridgeContext : cartridgeContexts) { - CartridgeDefinition cartridgeDefinition = new CartridgeDefinition(); - cartridgeDefinition.setType(cartridgeContext.getType()); - cartridgeDefinition.setCartridgeMin(cartridgeContext.getCartridgeMin()); - cartridgeDefinition.setCartridgeMax(cartridgeContext.getCartridgeMax()); - cartridgeDefinition.setSubscribableInfo(convertSubscribableInfoContextToSubscribableInfo(cartridgeContext.getSubscribableInfoContext())); - cartridgeDefinitions.add(cartridgeDefinition); + if(cartridgeContext != null) { + CartridgeDefinition cartridgeDefinition = new CartridgeDefinition(); + cartridgeDefinition.setType(cartridgeContext.getType()); + cartridgeDefinition.setCartridgeMin(cartridgeContext.getCartridgeMin()); + cartridgeDefinition.setCartridgeMax(cartridgeContext.getCartridgeMax()); + cartridgeDefinition.setSubscribableInfo(convertSubscribableInfoContextToSubscribableInfo(cartridgeContext.getSubscribableInfoContext())); + cartridgeDefinitions.add(cartridgeDefinition); + } } } return cartridgeDefinitions;
