Fix a bug for listZones and listServiceOfferings for normal user, caused by a misuse of SearchCriteria class.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/57d463cc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/57d463cc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/57d463cc Branch: refs/heads/marvin-refactor Commit: 57d463cc3f19821e3341a8cbe16bfb4082716c56 Parents: 1cf4b5c Author: Min Chen <[email protected]> Authored: Wed Jan 23 10:16:17 2013 -0800 Committer: Prasanna Santhanam <[email protected]> Committed: Sat Mar 30 22:22:39 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/api/query/QueryManagerImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57d463cc/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 951d09e..63c6b32 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -2105,7 +2105,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { domainRecord = _domainDao.findById(domainRecord.getParent()); domainIds.add(domainRecord.getId()); } - sc.addAnd("domainId", SearchCriteria.Op.IN, domainIds.toArray()); + sc.addAnd("domainId", SearchCriteria.Op.IN, domainIds); // include also public offering if no keyword, name and id specified if ( keyword == null && name == null && id == null ){ @@ -2238,7 +2238,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } // domainId == null (public zones) or domainId IN [all domain id up to root domain] SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria(); - sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); + sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds); sdc.addOr("domainId", SearchCriteria.Op.NULL); sc.addAnd("domain", SearchCriteria.Op.SC, sdc); @@ -2268,7 +2268,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { // domainId == null (public zones) or domainId IN [all domain id up to root domain] SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria(); - sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); + sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds); sdc.addOr("domainId", SearchCriteria.Op.NULL); sc.addAnd("domain", SearchCriteria.Op.SC, sdc);
