Repository: cloudstack Updated Branches: refs/heads/4.4 c3a4a0178 -> 7821da66c
Fix findBugs bug. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7821da66 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7821da66 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7821da66 Branch: refs/heads/4.4 Commit: 7821da66cc99b1d6071cc3a76953cbe5d7d0fb36 Parents: c3a4a01 Author: Min Chen <[email protected]> Authored: Fri Apr 18 17:35:01 2014 -0700 Committer: Min Chen <[email protected]> Committed: Fri Apr 18 17:35:01 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/user/AccountManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7821da66/server/src/com/cloud/user/AccountManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 364d0b7..37e4b43 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -2320,7 +2320,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M domainIdRecursiveListProject.second(false); // isRecursive is only valid if only domainId is passed. } - if (permittedDomains.isEmpty() && permittedAccounts.isEmpty() & permittedResources.isEmpty()) { + if (permittedDomains.isEmpty() && permittedAccounts.isEmpty() && permittedResources.isEmpty()) { // if at this point, all permitted arrays are empty, that means that caller cannot see anything, we put -1 in permittedAccounts // to distinguish this case from the case that caller can see everything permittedAccounts.add(-1L);
