CLOUDSTACK-4671:ListZone API failed with Assertion error if assertion is turned on for MS.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/22c5ea0e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/22c5ea0e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/22c5ea0e Branch: refs/heads/disk-cache Commit: 22c5ea0ebe3e2e037451832f688fd7e6404a36dc Parents: fea5ba7 Author: Min Chen <min.c...@citrix.com> Authored: Fri Sep 13 16:53:11 2013 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Fri Sep 13 17:21:24 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/22c5ea0e/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 0d6faef..3bf929a 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -2510,7 +2510,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sdc.addOr("accountId", SearchCriteria.Op.EQ, account.getId()); sdc.addOr("accountId", SearchCriteria.Op.NULL); - sc.addAnd("account", SearchCriteria.Op.SC, sdc); + sc.addAnd("accountId", SearchCriteria.Op.SC, sdc); } } else if (account.getType() == Account.ACCOUNT_TYPE_NORMAL) { @@ -2539,7 +2539,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria(); sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); sdc.addOr("domainId", SearchCriteria.Op.NULL); - sc.addAnd("domain", SearchCriteria.Op.SC, sdc); + sc.addAnd("domainId", SearchCriteria.Op.SC, sdc); // remove disabled zones sc.addAnd("allocationState", SearchCriteria.Op.NEQ, Grouping.AllocationState.Disabled); @@ -2550,7 +2550,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sdc2.addOr("accountId", SearchCriteria.Op.EQ, account.getId()); sdc2.addOr("accountId", SearchCriteria.Op.NULL); - sc.addAnd("account", SearchCriteria.Op.SC, sdc2); + sc.addAnd("accountId", SearchCriteria.Op.SC, sdc2); // remove Dedicated zones not dedicated to this domainId or // subdomainId @@ -2590,7 +2590,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria(); sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); sdc.addOr("domainId", SearchCriteria.Op.NULL); - sc.addAnd("domain", SearchCriteria.Op.SC, sdc); + sc.addAnd("domainId", SearchCriteria.Op.SC, sdc); // remove disabled zones sc.addAnd("allocationState", SearchCriteria.Op.NEQ, Grouping.AllocationState.Disabled); @@ -2619,7 +2619,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { if (dcIds.size() == 0) { return new Pair<List<DataCenterJoinVO>, Integer>(new ArrayList<DataCenterJoinVO>(), 0); } else { - sc.addAnd("idIn", SearchCriteria.Op.IN, dcIds.toArray()); + sc.addAnd("id", SearchCriteria.Op.IN, dcIds.toArray()); } }
