diff --git a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java index 2e8be2278a7659fbbef6dc5574e51c400033e016..c43cd7caebb5391726969ac64aa8c741a671071a 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java +++ b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java @@ -24,22 +24,24 @@ public class RepeatingPaymentUpdater public void updateRepeatingPayments(DateTime now) { try - { + { ArrayList<RepeatingPayment> repeatingPayments = handler.getAllRepeatingPayments(); ArrayList<LatestRepeatingPayment> latest = handler.getLatestRepeatingPaymentEntries(); for(RepeatingPayment currentPayment : repeatingPayments) { + DateTime date = now; int index = latest.indexOf(currentPayment); if(currentPayment.getRepeatEndDate() != null) { DateTime endDate = DateTime.parse(currentPayment.getRepeatEndDate()); - if(endDate.isBefore(now)) - { - now = endDate; + if(endDate.isBefore(date)) + { + date = endDate; } } - ArrayList<DateTime> correctDates = getCorrectRepeatingDates(currentPayment, now); + ArrayList<DateTime> correctDates = getCorrectRepeatingDates(currentPayment, date); + if(index != -1) { LatestRepeatingPayment currentLatest = latest.get(index);