killbill-memoizeit

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 f693aac..68d5182 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
@@ -275,7 +275,7 @@ public class BusinessInvoiceDao extends BusinessAnalyticsDaoBase {
         return InvoiceItemType.ITEM_ADJ.equals(invoiceItem.getInvoiceItemType());
     }
 
-    // Account credits, used or consumed
+    // Account credits, gained or consumed
     private boolean isAccountCreditItem(final InvoiceItem invoiceItem) {
         return InvoiceItemType.CBA_ADJ.equals(invoiceItem.getInvoiceItemType());
     }

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscriptionEvent.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscriptionEvent.java
index 3414995..ec64510 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscriptionEvent.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscriptionEvent.java
@@ -38,7 +38,6 @@ public class BusinessSubscriptionEvent {
         RE_ADD,
         TRANSFER,
         CHANGE,
-        SYSTEM_CANCEL,
         SYSTEM_CHANGE
     }
 
@@ -88,7 +87,8 @@ public class BusinessSubscriptionEvent {
             case TRANSFER:
                 return subscriptionTransfered(transition.getNextPlan());
             case CANCEL:
-                return subscriptionCancelled(transition.getNextPlan());
+                // Need to take the previous plan (the next one is null)
+                return subscriptionCancelled(transition.getPreviousPlan());
             case UNCANCEL:
                 return subscriptionUnCancelled(transition.getNextPlan());
             case CHANGE:

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionEvent.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionEvent.java
index 2ce6975..619ce11 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionEvent.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionEvent.java
@@ -35,10 +35,6 @@ public class TestBusinessSubscriptionEvent extends AnalyticsTestSuiteNoDB {
         event = BusinessSubscriptionEvent.valueOf("CANCEL_BASE");
         Assert.assertEquals(event.getEventType(), BusinessSubscriptionEvent.EventType.CANCEL);
         Assert.assertEquals(event.getCategory(), ProductCategory.BASE);
-
-        event = BusinessSubscriptionEvent.valueOf("SYSTEM_CANCEL_ADD_ON");
-        Assert.assertEquals(event.getEventType(), BusinessSubscriptionEvent.EventType.SYSTEM_CANCEL);
-        Assert.assertEquals(event.getCategory(), ProductCategory.ADD_ON);
     }
 
     @Test(groups = "fast")