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

ListIsos only shows cross-zone ISO in one zone.

This commit is contained in:
Min Chen 2013-07-18 10:53:33 -07:00
parent 7186473e33
commit 9a1cd1ac53
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,9 +400,9 @@ public class ViewResponseHelper {
}
public static List<TemplateResponse> createIsoResponse(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.newIsoResponse(vr);
@ -411,7 +411,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());
}