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

quota: fixes

This commit is contained in:
Abhinandan Prateek 2015-08-03 14:15:31 +05:30
parent b0a8598c3c
commit fc95ece6cb
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,18 +110,15 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
QuotaBalanceResponse resp = new QuotaBalanceResponse();
BigDecimal lastCredits = new BigDecimal(0);
boolean consecutive = true;
for (Iterator<QuotaBalanceVO> 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) {
if (consecutive) {
lastCredits = lastCredits.add(entry.getCreditBalance());
}
lastCredits = lastCredits.add(entry.getCreditBalance());
resp.addCredits(entry);
it.remove();
} else {
consecutive = false;
break;
}
}
@ -145,7 +142,7 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
@Override
public QuotaStatementResponse createQuotaStatementResponse(final List<QuotaUsageVO> quotaUsage) {
if (quotaUsage == null || quotaUsage.size() == 0) {
new InvalidParameterValueException("There is no uage data for period mentioned.");
throw new InvalidParameterValueException("There is no uage data for period mentioned.");
}
final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
TransactionLegacy.open(TransactionLegacy.USAGE_DB).close();