Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CA8E6C21D for ; Fri, 25 Jan 2013 12:55:32 +0000 (UTC) Received: (qmail 12299 invoked by uid 500); 25 Jan 2013 12:55:25 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 12261 invoked by uid 500); 25 Jan 2013 12:55:25 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 7195 invoked by uid 99); 25 Jan 2013 12:55:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jan 2013 12:55:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 40E17825372; Fri, 25 Jan 2013 12:55:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [26/50] git commit: Fix a bug for listZones and listServiceOfferings for normal user, caused by a misuse of SearchCriteria class. Message-Id: <20130125125510.40E17825372@tyr.zones.apache.org> Date: Fri, 25 Jan 2013 12:55:10 +0000 (UTC) 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 Authored: Wed Jan 23 10:16:17 2013 -0800 Committer: Min Chen 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 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 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);