Repository: cloudstack Updated Branches: refs/heads/master 82821daff -> c4892c269
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/c4892c26 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c4892c26 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c4892c26 Branch: refs/heads/master Commit: c4892c2692096e16656573bc1c8472d0b88dd1f4 Parents: 82821da Author: Min Chen <[email protected]> Authored: Fri Apr 18 17:31:29 2014 -0700 Committer: Min Chen <[email protected]> Committed: Fri Apr 18 17:31:29 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/c4892c26/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 b7eb712..32ff44a 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -2297,7 +2297,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);
