Merge remote-tracking branch 'origin/4.13'

yadvr · yadvr · commit ba8fb61a3309 · 2020-02-28T15:06:24.000+05:30
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -3762,8 +3762,10 @@ public Pair<List<? extends SSHKeyPair>, Integer> listSSHKeyPairs(final ListSSHKe
         }
 
         if (keyword != null) {
-            sc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
-            sc.addOr("fingerprint", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+            final SearchCriteria<SSHKeyPairVO> ssc = _sshKeyPairDao.createSearchCriteria();
+            ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+            ssc.addOr("fingerprint", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+            sc.addAnd("name", SearchCriteria.Op.SC, ssc);
         }
 
         final Pair<List<SSHKeyPairVO>, Integer> result = _sshKeyPairDao.searchAndCount(sc, searchFilter);

Original file line number	Diff line number	Diff line change
`@@ -3762,8 +3762,10 @@ public Pair<List<? extends SSHKeyPair>, Integer> listSSHKeyPairs(final ListSSHKe`
`3762`	`3762`	`}`
`3763`	`3763`
`3764`	`3764`	`if (keyword != null) {`
`3765`		`- sc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");`
`3766`		`- sc.addOr("fingerprint", SearchCriteria.Op.LIKE, "%" + keyword + "%");`
	`3765`	`+ final SearchCriteria<SSHKeyPairVO> ssc = _sshKeyPairDao.createSearchCriteria();`
	`3766`	`+ ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");`
	`3767`	`+ ssc.addOr("fingerprint", SearchCriteria.Op.LIKE, "%" + keyword + "%");`
	`3768`	`+ sc.addAnd("name", SearchCriteria.Op.SC, ssc);`
`3767`	`3769`	`}`
`3768`	`3770`
`3769`	`3771`	`final Pair<List<SSHKeyPairVO>, Integer> result = _sshKeyPairDao.searchAndCount(sc, searchFilter);`