From ed28e4ff19f0e0b9e4c12751f9f778ff463c67a1 Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Tue, 4 Aug 2015 12:07:31 +0530 Subject: [PATCH] Revert "quota: fixes" This reverts commit fc95ece6cbc4f9d6e633e025b8efb97525175783. --- .../cloudstack/api/response/QuotaResponseBuilderImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java index 56e4cedf3ec..de082eeaeb4 100644 --- a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java +++ b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java @@ -110,15 +110,18 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder { QuotaBalanceResponse resp = new QuotaBalanceResponse(); BigDecimal lastCredits = new BigDecimal(0); + boolean consecutive = true; for (Iterator it = quotaBalance.iterator(); it.hasNext();) { QuotaBalanceVO entry = it.next(); s_logger.info("createQuotaBalanceResponse: Date=" + entry.getUpdatedOn().toGMTString() + " balance=" + entry.getCreditBalance() + " credit=" + entry.getCreditsId()); if (entry.getCreditsId() > 0) { - lastCredits = lastCredits.add(entry.getCreditBalance()); + if (consecutive) { + lastCredits = lastCredits.add(entry.getCreditBalance()); + } resp.addCredits(entry); it.remove(); } else { - break; + consecutive = false; } }