Updated Branches: refs/heads/4.1 fbf300334 -> 7e12ffe4d
CLOUDSTACK-1465: We should pass array instead of a List for SearchCriteria.Op.IN as value. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7e12ffe4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7e12ffe4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7e12ffe4 Branch: refs/heads/4.1 Commit: 7e12ffe4de375542141a1ab2b4f584a3b87f20b0 Parents: fbf3003 Author: Min Chen <[email protected]> Authored: Tue Mar 5 13:46:06 2013 -0800 Committer: Chip Childers <[email protected]> Committed: Tue Mar 5 17:11:11 2013 -0500 ---------------------------------------------------------------------- .../src/com/cloud/api/query/QueryManagerImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7e12ffe4/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 746e8cb..8d8663a 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -1996,7 +1996,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } if (domainIds != null ){ - sc.setParameters("domainIdIn", domainIds); + sc.setParameters("domainIdIn", domainIds.toArray()); } if (includePublicOfferings){ @@ -2102,7 +2102,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { domainRecord = _domainDao.findById(domainRecord.getParent()); domainIds.add(domainRecord.getId()); } - sc.addAnd("domainId", SearchCriteria.Op.IN, domainIds); + sc.addAnd("domainId", SearchCriteria.Op.IN, domainIds.toArray()); // include also public offering if no keyword, name and id specified if ( keyword == null && name == null && id == null ){ @@ -2235,7 +2235,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); + sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); sdc.addOr("domainId", SearchCriteria.Op.NULL); sc.addAnd("domain", SearchCriteria.Op.SC, sdc); @@ -2265,7 +2265,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); + sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); sdc.addOr("domainId", SearchCriteria.Op.NULL); sc.addAnd("domain", SearchCriteria.Op.SC, sdc); @@ -2286,7 +2286,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { return new Pair<List<DataCenterJoinVO>, Integer>(new ArrayList<DataCenterJoinVO>(), 0); } else{ - sc.addAnd("idIn", SearchCriteria.Op.IN, dcIds); + sc.addAnd("idIn", SearchCriteria.Op.IN, dcIds.toArray()); } }
