killbill-memoizeit

Fix NPE in bundletimeline when there a future cancelled addon

9/4/2013 7:33:24 PM

Details

diff --git a/subscription/src/main/java/com/ning/billing/subscription/engine/dao/DefaultSubscriptionDao.java b/subscription/src/main/java/com/ning/billing/subscription/engine/dao/DefaultSubscriptionDao.java
index ae969ab..3b9dd95 100644
--- a/subscription/src/main/java/com/ning/billing/subscription/engine/dao/DefaultSubscriptionDao.java
+++ b/subscription/src/main/java/com/ning/billing/subscription/engine/dao/DefaultSubscriptionDao.java
@@ -769,6 +769,7 @@ public class DefaultSubscriptionDao implements SubscriptionDao {
                                                                                              .setProcessedDate(now)
                                                                                              .setEffectiveDate(futureBaseEvent.getEffectiveDate())
                                                                                              .setRequestedDate(now)
+                                                                                             .setCreatedDate(futureBaseEvent.getCreatedDate())
                                                                                                      // This event is only there to indicate the ADD_ON is future canceled, but it is not there
                                                                                                      // on disk until the base plan cancellation becomes effective
                                                                                              .setFromDisk(false));