From 003787a69a6663a742e931dc3f88aff9fb9e0414 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Mon, 21 Feb 2011 19:38:08 +0530
Subject: [PATCH] bug 8613: Added accountId to listUsageRecords API, use active
 account incase of multiple account with same name status 8613: resolved fixed

---
 server/src/com/cloud/user/dao/AccountDao.java     | 2 +-
 server/src/com/cloud/user/dao/AccountDaoImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/user/dao/AccountDao.java b/server/src/com/cloud/user/dao/AccountDao.java
index c2a5ca7cbe0..6e2ac0647eb 100644
--- a/server/src/com/cloud/user/dao/AccountDao.java
+++ b/server/src/com/cloud/user/dao/AccountDao.java
@@ -40,5 +40,5 @@ public interface AccountDao extends GenericDao<AccountVO, Long> {
     List<AccountVO> findCleanups();
     List<AccountVO> findAdminAccountsForDomain(Long domainId);
     void markForCleanup(long accountId);
-    List<AccountVO> listAccounts(String accountName, Long domainId);
+    List<AccountVO> listAccounts(String accountName, Long domainId, Filter filter);
 }
diff --git a/server/src/com/cloud/user/dao/AccountDaoImpl.java b/server/src/com/cloud/user/dao/AccountDaoImpl.java
index f3cb174c93b..987a5e58b4a 100644
--- a/server/src/com/cloud/user/dao/AccountDaoImpl.java
+++ b/server/src/com/cloud/user/dao/AccountDaoImpl.java
@@ -132,10 +132,10 @@ public class AccountDaoImpl extends GenericDaoBase<AccountVO, Long> implements A
     }
     
     @Override
-    public List<AccountVO> listAccounts(String accountName, Long domainId) {
+    public List<AccountVO> listAccounts(String accountName, Long domainId, Filter filter) {
         SearchCriteria<AccountVO> sc = AccountNameSearch.create("accountName", accountName);
         sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
-        return listIncludingRemovedBy(sc);
+        return listIncludingRemovedBy(sc, filter);
     }
     
     @Override