Repository: cloudstack Updated Branches: refs/heads/4.4 073928fef -> 5fe7eb335
CLOUDSTACK-6843: [Automation] List listServiceOfferings api fails with NPE Incorrect parameter name used in query building resulted in a bad sql query. (cherry picked from commit 025c143ac7929055577911114751118cf5319592) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5fe7eb33 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fe7eb33 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5fe7eb33 Branch: refs/heads/4.4 Commit: 5fe7eb33576e66b692fdece84b56e38af50e2a42 Parents: 073928f Author: Koushik Das <[email protected]> Authored: Thu Jun 5 13:53:57 2014 +0530 Committer: Daan Hoogland <[email protected]> Committed: Thu Jun 5 15:51:39 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fe7eb33/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 12c871c..cf45f20 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -2546,7 +2546,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } if (vmTypeStr != null) { - sc.addAnd("vm_type", SearchCriteria.Op.EQ, vmTypeStr); + sc.addAnd("vmType", SearchCriteria.Op.EQ, vmTypeStr); } return _srvOfferingJoinDao.searchAndCount(sc, searchFilter);
