Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Jessica Wang 2010-10-26 18:01:30 -07:00
commit 8d30ae81af
1 changed files with 1 additions and 1 deletions

View File

@ -122,7 +122,7 @@ public class RegisterIsoCmd extends BaseCmd {
List<TemplateResponse> responses = new ArrayList<TemplateResponse>();
List<DataCenterVO> zones = null;
if (zoneId != null) {
if ((zoneId != null) && (zoneId != -1)) {
zones = new ArrayList<DataCenterVO>();
zones.add(ApiDBUtils.findZoneById(zoneId));
} else {