killbill-memoizeit

Details

diff --git a/catalog/src/main/java/com/ning/billing/catalog/Plan.java b/catalog/src/main/java/com/ning/billing/catalog/Plan.java
index 5b0a926..3d69b29 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/Plan.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/Plan.java
@@ -49,7 +49,7 @@ public class Plan extends ValidatingConfig<Catalog> implements IPlan {
 	
 	@XmlElementWrapper(name="initialPhases", required=false)
 	@XmlElement(name="phase", required=true)
-    private PlanPhase[] initialPhases;
+    private PlanPhase[] initialPhases = new PlanPhase[0];
 	
 	@XmlElement(name="finalPhase", required=true)
     private PlanPhase finalPhase;
diff --git a/catalog/src/main/java/com/ning/billing/catalog/PriceListSet.java b/catalog/src/main/java/com/ning/billing/catalog/PriceListSet.java
index 7cd2986..10010a7 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/PriceListSet.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/PriceListSet.java
@@ -33,7 +33,7 @@ public class PriceListSet extends ValidatingConfig<Catalog> {
 	private PriceListDefault defaultPricelist;
 	
 	@XmlElement(required=false, name="childPriceList")
-	private PriceList[] childPriceLists;
+	private PriceList[] childPriceLists = new PriceList[0];
 	
 	public PriceListSet() {
 		if(childPriceLists == null) {
diff --git a/catalog/src/main/java/com/ning/billing/catalog/Product.java b/catalog/src/main/java/com/ning/billing/catalog/Product.java
index fb2ffb5..c0fa749 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/Product.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/Product.java
@@ -33,6 +33,7 @@ import com.ning.billing.util.config.ValidationErrors;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class Product extends ValidatingConfig<Catalog> implements IProduct {
+	private static final Product[] EMPTY_PRODUCT_LIST = new Product[0];
 	
 	@XmlAttribute (required=true)
 	@XmlID
@@ -43,11 +44,11 @@ public class Product extends ValidatingConfig<Catalog> implements IProduct {
 	
 	@XmlElementWrapper(name="included", required=false)
 	@XmlIDREF @XmlElement(name="addonProduct", required=true)
-    private Product[] included;
+    private Product[] included = EMPTY_PRODUCT_LIST;
 	
 	@XmlElementWrapper(name="available", required=false)
 	@XmlIDREF @XmlElement(name="addonProduct", required=true)
-    private Product[] available;
+    private Product[] available = EMPTY_PRODUCT_LIST;
 
 	//Not included in XML
 	private String catalogName;