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

bug 10639: if register iso for all zones, zoneId is -1, 

fixed

status 10639: resolved fixed
This commit is contained in:
anthony 2011-07-07 20:59:50 -07:00
parent 0f064e394b
commit 093af8afdf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -1403,7 +1403,7 @@ public class ApiResponseHelper implements ResponseGenerator {
return isoResponses;
} else {
List<DataCenterVO> dcs = new ArrayList<DataCenterVO>();
if (zoneId == null) {
if (zoneId == null || zoneId == -1 ) {
dcs.addAll(ApiDBUtils.listZones());
for (DataCenterVO dc : dcs ) {
isoResponses.addAll(createIsoResponses(iso, dc.getId(), readyOnly));
@ -1420,6 +1420,9 @@ public class ApiResponseHelper implements ResponseGenerator {
long isoId = iso.getId();
List<TemplateResponse> isoResponses = new ArrayList<TemplateResponse>();
VMTemplateHostVO isoHost = ApiDBUtils.findTemplateHostRef(isoId, zoneId, readyOnly);
if( isoHost == null ) {
return isoResponses;
}
TemplateResponse isoResponse = new TemplateResponse();
isoResponse.setId(iso.getId());
isoResponse.setName(iso.getName());