cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [2/2] git commit: updated refs/heads/4.1 to 50c7a48
Date Mon, 19 Aug 2013 17:33:06 GMT
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/50c7a482
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50c7a482
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50c7a482

Branch: refs/heads/4.1
Commit: 50c7a48254468a564d07a40371fec23b11a76c14
Parents: 52aaa33
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Tue Aug 13 21:55:55 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Mon Aug 19 19:23:35 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/50c7a482/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 76c6d49..9a78b2e 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1008,11 +1008,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) {


Mime
View raw message