killbill-memoizeit

subscription: CR integration for 1bc8614bd. See #619

10/11/2016 8:59:42 PM

stephane brossier

Commit: 30783ad

Tree: a48b68b

Parents: d7d640d

Changes

subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java 2(+1 -1)

Details

subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java 2(+1 -1)

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
index 75eabb5..8899098 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
@@ -692,7 +692,7 @@ public class DefaultSubscriptionDao extends EntityDaoBase<SubscriptionBundleMode
         for (final SubscriptionEventModelDao cur : eventModels) {
 
             // Skip CREATE event (because of date equality in the query and we don't want to invalidate CREATE event that match a CANCEL event)
-            if (cur.getEventType() == EventType.API_USER && cur.getUserType()== ApiEventType.CREATE) {
+            if (cur.getEventType() == EventType.API_USER && (cur.getUserType()== ApiEventType.CREATE || cur.getUserType()== ApiEventType.TRANSFER)) {
                 continue;
             }