etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

quota: fix balance api to send result when no debits have been made 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-07-27 13:25:15 +05:30
parent 38146d87eb
commit d9c38249c7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
View File

@ -99,14 +99,15 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
for (Iterator<QuotaBalanceVO> 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;
}