killbill-memoizeit

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPriceListSet.java b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPriceListSet.java
index b1334ae..3dfbe13 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/DefaultPriceListSet.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/DefaultPriceListSet.java
@@ -39,7 +39,7 @@ public class DefaultPriceListSet extends ValidatingConfig<StandaloneCatalog> {
     private PriceListDefault defaultPricelist;
 
     @XmlElement(required = false, name = "childPriceList")
-    private DefaultPriceList[] childPriceLists = new DefaultPriceList[0];
+    private DefaultPriceList[] childPriceLists;
 
     public DefaultPriceListSet() {
         if (childPriceLists == null) {
@@ -49,7 +49,7 @@ public class DefaultPriceListSet extends ValidatingConfig<StandaloneCatalog> {
 
     public DefaultPriceListSet(final PriceListDefault defaultPricelist, final DefaultPriceList[] childPriceLists) {
         this.defaultPricelist = defaultPricelist;
-        this.childPriceLists = childPriceLists;
+        this.childPriceLists = childPriceLists != null ? childPriceLists : new DefaultPriceList[0];
     }
 
     public DefaultPlan getPlanFrom(final String priceListName, final Product product,

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java b/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java
index e70f9d1..af8617d 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java
@@ -347,7 +347,7 @@ public class StandaloneCatalogMapper {
             public DefaultPriceList apply(final PriceList input) {
                 return toDefaultPriceList(input);
             }
-        }, false);
+        }, true);
     }
 
     private DefaultPrice[] toDefaultPrices(final Iterable<Price> input) {