You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/09 15:21:09 UTC
[32/50] [abbrv] git commit: updated refs/heads/marvin_refactor to
2a99064
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/313ac21a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/313ac21a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/313ac21a
Branch: refs/heads/marvin_refactor
Commit: 313ac21af5dd0bf0909c8af7e9da2ee9172fca3f
Parents: 7e80721
Author: Min Chen <mi...@citrix.com>
Authored: Wed Jan 23 10:16:17 2013 -0800
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sun Mar 31 22:19:14 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/313ac21a/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);