apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1465: We should pass array instead of a List for SearchCriteria.Op.IN as value.

Browse Source
This commit is contained in:
Min Chen 2013-03-05 13:46:06 -08:00
parent 7dbea68b87
commit 33757377c0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/api/query/QueryManagerImpl.java
View File

@ -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());
}
}