You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/01/25 13:55:10 UTC
[26/50] git commit: Fix a bug for listZones and listServiceOfferings
for normal user, caused by a misuse of SearchCriteria class.
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/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/485761f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/485761f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/485761f0
Branch: refs/heads/events-framework
Commit: 485761f0b4b74e7f8ad63221168485fdfe666678
Parents: 75b059e
Author: Min Chen <mi...@citrix.com>
Authored: Wed Jan 23 10:16:17 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Wed Jan 23 10:17:08 2013 -0800
----------------------------------------------------------------------
.../src/com/cloud/api/query/QueryManagerImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/485761f0/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 a943776..cf240b1 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2131,7 +2131,7 @@ public class QueryManagerImpl implements QueryService, Manager {
domainRecord = _domainDao.findById(domainRecord.getParent());
domainIds.add(domainRecord.getId());
}
- sc.addAnd("domainIdIn", SearchCriteria.Op.IN, domainIds);
+ 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 ){
@@ -2261,7 +2261,7 @@ public class QueryManagerImpl implements QueryService, Manager {
}
// domainId == null (public zones) or domainId IN [all domain id up to root domain]
SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria();
- sdc.addOr("domainIdIn", SearchCriteria.Op.IN, domainIds);
+ sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds);
sdc.addOr("domainId", SearchCriteria.Op.NULL);
sc.addAnd("domain", SearchCriteria.Op.SC, sdc);
@@ -2291,7 +2291,7 @@ public class QueryManagerImpl implements QueryService, Manager {
// domainId == null (public zones) or domainId IN [all domain id up to root domain]
SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria();
- sdc.addOr("domainIdIn", SearchCriteria.Op.IN, domainIds);
+ sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds);
sdc.addOr("domainId", SearchCriteria.Op.NULL);
sc.addAnd("domain", SearchCriteria.Op.SC, sdc);