From ae9b6d4fe1feb50e5329d0000f1d4bb76a07c5da Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Tue, 26 Oct 2010 17:55:00 -0700
Subject: [PATCH] bug 6776: for some reason, we checked for zoneId = -1 in
 registerTemplate and applied it to all zones, but this wasn't done for
 registerIso.  Oh well, make the change for registerIso and things seem happy
 again

status 6776: resolved fixed
---
 server/src/com/cloud/api/commands/RegisterIsoCmd.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/commands/RegisterIsoCmd.java b/server/src/com/cloud/api/commands/RegisterIsoCmd.java
index 372242b3c11..1cb60106513 100755
--- a/server/src/com/cloud/api/commands/RegisterIsoCmd.java
+++ b/server/src/com/cloud/api/commands/RegisterIsoCmd.java
@@ -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 {