Updated Branches: refs/heads/master cdbcc6663 -> 52434dabc
CLOUDSTACK-2595: [Automation] Failed download default template for second zone. Actually it is a listTemplate issue. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52434dab Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52434dab Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52434dab Branch: refs/heads/master Commit: 52434dabcc733a1627fcd4b170de7ef5f5b8f782 Parents: cdbcc66 Author: Min Chen <[email protected]> Authored: Mon Jul 15 17:36:01 2013 -0700 Committer: Min Chen <[email protected]> Committed: Mon Jul 15 17:38:09 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 2 +- server/src/com/cloud/api/query/ViewResponseHelper.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52434dab/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 90a3b6f..462a276 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -2694,7 +2694,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { SearchBuilder<TemplateJoinVO> sb = _templateJoinDao.createSearchBuilder(); sb.select(null, Func.DISTINCT, sb.entity().getTempZonePair()); // select distinct (templateId, zoneId) pair - SearchCriteria<TemplateJoinVO> sc = _templateJoinDao.createSearchCriteria(); + SearchCriteria<TemplateJoinVO> sc = sb.create(); // verify templateId parameter and specially handle it if (templateId != null) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52434dab/server/src/com/cloud/api/query/ViewResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/ViewResponseHelper.java b/server/src/com/cloud/api/query/ViewResponseHelper.java index b98cea3..5972229 100644 --- a/server/src/com/cloud/api/query/ViewResponseHelper.java +++ b/server/src/com/cloud/api/query/ViewResponseHelper.java @@ -366,9 +366,9 @@ public class ViewResponseHelper { } public static List<TemplateResponse> createTemplateResponse(TemplateJoinVO... templates) { - Hashtable<Long, TemplateResponse> vrDataList = new Hashtable<Long, TemplateResponse>(); + Hashtable<String, TemplateResponse> vrDataList = new Hashtable<String, TemplateResponse>(); for (TemplateJoinVO vr : templates) { - TemplateResponse vrData = vrDataList.get(vr.getId()); + TemplateResponse vrData = vrDataList.get(vr.getTempZonePair()); if ( vrData == null ){ // first time encountering this volume vrData = ApiDBUtils.newTemplateResponse(vr); @@ -377,7 +377,7 @@ public class ViewResponseHelper { // update tags vrData = ApiDBUtils.fillTemplateDetails(vrData, vr); } - vrDataList.put(vr.getId(), vrData); + vrDataList.put(vr.getTempZonePair(), vrData); } return new ArrayList<TemplateResponse>(vrDataList.values()); }
