Updated Branches: refs/heads/master da7f924cc -> 3ab1abc6b
CLOUDSTACK-4296: fix a similar issue (cherry picked from commit e2f47871d17351dae7555a48e0cd4d3dbe2ab2e2) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ab1abc6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ab1abc6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ab1abc6 Branch: refs/heads/master Commit: 3ab1abc6ba0b86464d32abb945a3c025237493a3 Parents: da7f924 Author: Wei Zhou <[email protected]> Authored: Tue Aug 13 21:55:55 2013 +0200 Committer: Wei Zhou <[email protected]> Committed: Tue Aug 13 21:56:21 2013 +0200 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ab1abc6/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 ff96c7e..94307e8 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -1132,11 +1132,11 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { if (keyword != null) { SearchCriteria<DomainRouterJoinVO> ssc = _routerJoinDao.createSearchCriteria(); - ssc.addOr("hostName", SearchCriteria.Op.LIKE, "%" + keyword + "%"); + ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("instanceName", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("state", SearchCriteria.Op.LIKE, "%" + keyword + "%"); - sc.addAnd("hostName", SearchCriteria.Op.SC, ssc); + sc.addAnd("instanceName", SearchCriteria.Op.SC, ssc); } if (name != null) {
