From d9c38249c701d006af1bace207f8e2ced1edb88c Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 27 Jul 2015 13:25:15 +0530 Subject: [PATCH] quota: fix balance api to send result when no debits have been made Signed-off-by: Rohit Yadav --- .../api/response/QuotaResponseBuilderImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 d0d2123c3c9..1f9c170214f 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 @@ -99,14 +99,15 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder { for (Iterator it = quotaBalance.iterator(); it.hasNext();) { QuotaBalanceVO entry = it.next(); s_logger.info("Date=" + entry.getUpdatedOn().toGMTString() + " balance=" + entry.getCreditBalance() + " credit=" + entry.getCreditsId()); - if (entry.getCreditsId() > 0) { - lastCredits = lastCredits.add(entry.getCreditBalance()); - } else { - resp.setStartQuota(entry.getCreditBalance().add(lastCredits)); - break; // add only consecutive credit entries + if (lastCredits.compareTo(new BigDecimal(0)) == 0) { + resp.setStartQuota(entry.getCreditBalance()); + resp.setStartDate(startDate); } + lastCredits = lastCredits.add(entry.getCreditBalance()); + resp.addCredits(entry); } - resp.setStartDate(startDate); + resp.setEndQuota(lastCredits); + resp.setEndDate(_quotaService.computeAdjustedTime(new Date())); resp.setObjectName("balance"); return resp; }