killbill-memoizeit

invoice: fix potential NPE in InvoiceCalculatorUtils Signed-off-by:

1/9/2015 9:34:10 PM

Details

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/calculator/InvoiceCalculatorUtils.java b/invoice/src/main/java/org/killbill/billing/invoice/calculator/InvoiceCalculatorUtils.java
index e815d1f..1437745 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/calculator/InvoiceCalculatorUtils.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/calculator/InvoiceCalculatorUtils.java
@@ -140,7 +140,7 @@ public abstract class InvoiceCalculatorUtils {
 
         for (final InvoiceItem invoiceItem : invoiceItems) {
             if (isCharge(invoiceItem) &&
-                invoiceItem.getCreatedDate().equals(invoiceCreatedDate)) {
+                (invoiceItem.getCreatedDate() != null && invoiceItem.getCreatedDate().equals(invoiceCreatedDate))) {
                 amountCharged = amountCharged.add(invoiceItem.getAmount());
             }
         }