From 9a1cd1ac5398563b65b689d5f5d6a10bae3815b2 Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Thu, 18 Jul 2013 10:53:33 -0700
Subject: [PATCH] ListIsos only shows cross-zone ISO in one zone.

---
 server/src/com/cloud/api/query/ViewResponseHelper.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/api/query/ViewResponseHelper.java b/server/src/com/cloud/api/query/ViewResponseHelper.java
index 59722297d6d..49c280ec857 100644
--- a/server/src/com/cloud/api/query/ViewResponseHelper.java
+++ b/server/src/com/cloud/api/query/ViewResponseHelper.java
@@ -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());
     }