etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

API: Fix listSSHKeyPairs API when listing all resources (listall=true & projectid=-1)

This commit is contained in:
Pearl Dsilva 2021-12-29 13:42:31 +05:30
parent 7823868746
commit c20aa99ca4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
View File

@ -41,6 +41,7 @@ import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import java.util.UUID;
@ -1293,7 +1294,8 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
fromIndex += onClause.length();
}
str.delete(str.length() - 4, str.length());
int diff = str.toString().trim().toLowerCase(Locale.ROOT).endsWith("where") ? 6 : 4;
str.delete(str.length() - diff, str.length());
for (JoinBuilder<SearchCriteria<?>> join : joins) {
if (join.getT().getJoins() != null) {