killbill-uncached

Fix NPE in BusinessInvoiceDao when finding repairee item and …

4/18/2013 8:45:50 PM

type is FIXED

stephane brossier

Commit: cbca67d

Tree: 541bddf

Parents: 4690467

Changes

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java 4(+3 -1)

Details

osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java 4(+3 -1)

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java
index 2e56de4..3654cc8 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java
@@ -371,7 +371,9 @@ public class BusinessInvoiceDao extends BusinessAnalyticsDaoBase {
                 if (repairedInvoiceItem.getInvoiceItemType().equals(invoiceItem.getInvoiceItemType()) &&
                     repairedInvoiceItem.getSubscriptionId().equals(invoiceItem.getSubscriptionId()) &&
                     repairedInvoiceItem.getStartDate().compareTo(invoiceItem.getStartDate()) == 0 &&
-                    !repairedInvoiceItem.getEndDate().isBefore(invoiceItem.getEndDate()) &&
+                    // FIXED items have a null end date
+                    ((repairedInvoiceItem.getEndDate() == null && invoiceItem.getEndDate() == null) ||
+                     (repairedInvoiceItem.getEndDate() != null && invoiceItem.getEndDate() != null && !repairedInvoiceItem.getEndDate().isBefore(invoiceItem.getEndDate()))) &&
                     !repairedInvoiceItem.getId().equals(invoiceItem.getId())) {
                     if (reparationItem == null) {
                         reparationItem = invoiceItem;