killbill-memoizeit

invoice: make sure to always specify an external charge start

4/20/2014 7:01:51 PM

Details

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
index cc10780..5231b09 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
@@ -58,6 +58,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
+import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -592,7 +593,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
                                                                                        null,
                                                                                        null,
                                                                                        null,
-                                                                                       charge.getStartDate(),
+                                                                                       Objects.firstNonNull(charge.getStartDate(), effectiveDate),
                                                                                        charge.getEndDate(),
                                                                                        charge.getAmount(),
                                                                                        null,