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

CLOUDSTACK-2595: [Automation] Failed download default template for 

second zone. Actually it is a listTemplate issue.
This commit is contained in:
Min Chen 2013-07-15 17:36:01 -07:00
parent 9c1e02ae5a
commit dabedd0848
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/api/query/QueryManagerImpl.java
View File

@ -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) {

6
server/src/com/cloud/api/query/ViewResponseHelper.java
View File

@ -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());
}