You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/08/25 17:36:02 UTC

[06/52] git commit: updated refs/heads/saml2 to 1d809ff

CLOUDSTACK-7417: Admin cannot archive or delete events for a deleted account.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc200234
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc200234
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc200234

Branch: refs/heads/saml2
Commit: fc200234111267f5eec159f5a64409ba018bf4a8
Parents: 8ce6eba
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Mon Aug 25 14:55:58 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Mon Aug 25 14:56:30 2014 +0530

----------------------------------------------------------------------
 engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc200234/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java
index 99bd7ee..9ae279f 100755
--- a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java
+++ b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java
@@ -275,7 +275,7 @@ public class AccountDaoImpl extends GenericDaoBase<AccountVO, Long> implements A
     public List<Long> getAccountIdsForDomains(List<Long> domainIds) {
         SearchCriteria<Long> sc = AccountIdsSearch.create();
         sc.setParameters("ids", domainIds.toArray(new Object[domainIds.size()]));
-        return customSearch(sc, null);
+        return customSearchIncludingRemoved(sc, null);
     }
 
     @Override