quota: fixes

abhinandanprateek · abhinandanprateek · commit fc95ece6cbc4 · 2015-08-03T14:15:31.000+05:30
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
@@ -110,18 +110,15 @@ public int compare(QuotaBalanceVO o1, QuotaBalanceVO o2) {
 
         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 int compare(QuotaBalanceVO o1, QuotaBalanceVO o2) {
     @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();
