killbill-aplcache

invoice: Harden RawUsageOptimizer against potential NPE

2/22/2018 7:53:10 PM

stephane brossier

Commit: 3133970

Tree: 1e7b468

Parents: 54c2568

Changes

invoice/src/main/java/org/killbill/billing/invoice/usage/RawUsageOptimizer.java 2(+1 -1)

Details

invoice/src/main/java/org/killbill/billing/invoice/usage/RawUsageOptimizer.java 2(+1 -1)

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/usage/RawUsageOptimizer.java b/invoice/src/main/java/org/killbill/billing/invoice/usage/RawUsageOptimizer.java
index 295c376..b0f27f8 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/usage/RawUsageOptimizer.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/usage/RawUsageOptimizer.java
@@ -134,7 +134,7 @@ public class RawUsageOptimizer {
             }
         }
 
-        final LocalDate result = targetStartDate.compareTo(firstEventStartDate) > 0 ? targetStartDate : firstEventStartDate;
+        final LocalDate result = targetStartDate != null && targetStartDate.compareTo(firstEventStartDate) > 0 ? targetStartDate : firstEventStartDate;
         return result;
     }