From 677564f7ee09fb96164ab0014a9cb60f9d419db0 Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Date: Fri, 16 Oct 2015 09:51:49 +0530
Subject: [PATCH] CLOUDSTACK-8592: fix sort order for tariff

---
 .../org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java   | 4 ++--
 .../src/org/apache/cloudstack/quota/QuotaServiceImpl.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java b/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java
index d250f2bc8f0..c80db817e59 100644
--- a/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java
+++ b/framework/quota/src/org/apache/cloudstack/quota/dao/QuotaTariffDaoImpl.java
@@ -59,7 +59,7 @@ public class QuotaTariffDaoImpl extends GenericDaoBase<QuotaTariffVO, Long> impl
         final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
         List<QuotaTariffVO> result = new ArrayList<>();
         try (TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB)) {
-            final Filter filter = new Filter(QuotaTariffVO.class, "effectiveOn", false, 0L, 1L);
+            final Filter filter = new Filter(QuotaTariffVO.class, "updatedOn", false, 0L, 1L);
             final SearchCriteria<QuotaTariffVO> sc = listAllIncludedUsageType.create();
             sc.setParameters("onorbefore", effectiveDate);
             sc.setParameters("quotatype", quotaType);
@@ -103,7 +103,7 @@ public class QuotaTariffDaoImpl extends GenericDaoBase<QuotaTariffVO, Long> impl
         final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
         List<QuotaTariffVO> tariffs = new ArrayList<QuotaTariffVO>();
         try (TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB)) {
-            final Filter filter = new Filter(QuotaTariffVO.class, "effectiveOn", false, 0L, 1L);
+            final Filter filter = new Filter(QuotaTariffVO.class, "updatedOn", false, 0L, 1L);
             final SearchCriteria<QuotaTariffVO> sc = listAllIncludedUsageType.create();
             sc.setParameters("onorbefore", effectiveDate);
             for (Integer quotaType : QuotaTypes.listQuotaTypes().keySet()) {
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java
index c150250b1f8..13265e7caeb 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java
@@ -219,7 +219,7 @@ public class QuotaServiceImpl extends ManagerBase implements QuotaService, Confi
             if (_domainDao.isChildDomain(caller.getDomainId(), domainId)) {
                 Filter filter = new Filter(AccountVO.class, "id", Boolean.FALSE, null, null);
                 List<AccountVO> accounts = _accountDao.listAccounts(accountName, domainId, filter);
-                if (accounts.size() > 0) {
+                if (!accounts.isEmpty()) {
                     userAccount = accounts.get(0);
                 }
                 if (userAccount != null) {