From 13e25d2aae1c3ec48a6c770e5b20e05c17742db2 Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Wed, 19 Feb 2014 11:35:00 -0800
Subject: [PATCH] Fixed a bug in constructing search parameters with
 accountName passed.

---
 server/src/com/cloud/user/AccountManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 8509114e87a..8f4d3abdd7a 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -2295,8 +2295,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
                 List<Long> grantedAccounts = qs.getAuthorizedAccounts(caller, action);
                 List<Long> grantedResources = qs.getAuthorizedResources(caller, action);
 
-                if (domainId != null) {
-                    // specific domain is specified
+                if (permittedAccounts.isEmpty() && domainId != null) {
+                    // specific domain and no account is specified
                     if (grantedDomains.contains(domainId)) {
                         permittedDomains.add(domainId);
                     } else {