From 6c944dc40990356b853014da42a8d1442f030ddd Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Date: Wed, 22 Jul 2015 14:45:18 +0530
Subject: [PATCH] quota: fix tariff type

---
 .../src/org/apache/cloudstack/quota/QuotaManagerImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
index 28c00c78881..b9e71106e08 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
@@ -323,7 +323,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
     @DB
     private QuotaUsageVO updateQuotaRaw(UsageVO usageRecord, BigDecimal aggregationRatio, int ruleType) {
         QuotaUsageVO quota_usage = null;
-        QuotaTariffVO tariff = _quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.ALLOCATED_VM, usageRecord.getEndDate());
+        QuotaTariffVO tariff = _quotaTariffDao.findTariffPlanByUsageType(ruleType, usageRecord.getEndDate());
         if (tariff != null) {
             BigDecimal ruleusage;
             BigDecimal onehourcost;
@@ -343,7 +343,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
     @DB
     private QuotaUsageVO updateQuotaNetwork(UsageVO usageRecord, int transferType) {
         QuotaUsageVO quota_usage = null;
-        QuotaTariffVO tariff = _quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.ALLOCATED_VM, usageRecord.getEndDate());
+        QuotaTariffVO tariff = _quotaTariffDao.findTariffPlanByUsageType(transferType, usageRecord.getEndDate());
         if (tariff != null) {
             BigDecimal onegbcost;
             BigDecimal rawusageingb;