junction: Fix major typo where recurringBillingMode ends up being null!

killbill · Aug 28, 2015 · 65d54b9 · 65d54b9
1 parent 441ed79
commit 65d54b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.../src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEventSet.java b/.../src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEventSet.java
@@ -45,7 +45,7 @@ public class DefaultBillingEventSet extends TreeSet<BillingEvent> implements Sor
 
     private boolean accountAutoInvoiceOff = false;
     private List<UUID> subscriptionIdsWithAutoInvoiceOff = new ArrayList<UUID>();
-    private BillingMode recurrringBillingMode;
+    private BillingMode recurringBillingMode;
 
     /* (non-Javadoc)
     * @see org.killbill.billing.junction.plumbing.billing.BillingEventSet#isAccountAutoInvoiceOff()
@@ -57,7 +57,7 @@ public boolean isAccountAutoInvoiceOff() {
 
     @Override
     public BillingMode getRecurringBillingMode() {
-        return null;
+        return recurringBillingMode;
     }
 
     /* (non-Javadoc)
@@ -90,12 +90,8 @@ public void setAccountAutoInvoiceIsOff(final boolean accountAutoInvoiceIsOff) {
         this.accountAutoInvoiceOff = accountAutoInvoiceIsOff;
     }
 
-    public BillingMode getRecurrringBillingMode() {
+    public void setRecurringBillingMode(final BillingMode recurringBillingMode) {
-        return recurrringBillingMode;
+        this.recurringBillingMode = recurringBillingMode;
-    }
-
-    public void setRecurrringBillingMode(final BillingMode recurrringBillingMode) {
-        this.recurrringBillingMode = recurrringBillingMode;
     }
 
     @Override

diff --git a/...c/main/java/org/killbill/billing/junction/plumbing/billing/DefaultInternalBillingApi.java b/...c/main/java/org/killbill/billing/junction/plumbing/billing/DefaultInternalBillingApi.java
@@ -86,7 +86,7 @@ public BillingEventSet getBillingEventsForAccountAndUpdateAccountBCD(final UUID
         final List<SubscriptionBaseBundle> bundles = subscriptionApi.getBundlesForAccount(accountId, context);
         final DefaultBillingEventSet result = new DefaultBillingEventSet();
         final StaticCatalog currentCatalog = catalogService.getCurrentCatalog(context);
-        result.setRecurrringBillingMode(currentCatalog.getRecurringBillingMode());
+        result.setRecurringBillingMode(currentCatalog.getRecurringBillingMode());
 
         try {
             final Account account = accountApi.getAccountById(accountId, context);