cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/4.2 to e2f4787
Date Tue, 13 Aug 2013 19:56:04 GMT
Updated Branches:
  refs/heads/4.2 72f013f78 -> e2f47871d


CLOUDSTACK-4296: fix a similar issue


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e2f47871
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e2f47871
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e2f47871

Branch: refs/heads/4.2
Commit: e2f47871d17351dae7555a48e0cd4d3dbe2ab2e2
Parents: 72f013f
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Tue Aug 13 21:55:55 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Tue Aug 13 21:55:55 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/e2f47871/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 c0180f0..befcf8d 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1143,11 +1143,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