cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/master to 598a647
Date Thu, 18 Jul 2013 17:57:09 GMT
Updated Branches:
  refs/heads/master 2b0757beb -> 598a64710


ListIsos only shows cross-zone ISO in one zone.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/598a6471
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/598a6471
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/598a6471

Branch: refs/heads/master
Commit: 598a647105bd592129553c10881f212315eb1a83
Parents: 2b0757b
Author: Min Chen <min.chen@citrix.com>
Authored: Thu Jul 18 10:53:33 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu Jul 18 10:56:45 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/598a6471/server/src/com/cloud/api/query/ViewResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/ViewResponseHelper.java b/server/src/com/cloud/api/query/ViewResponseHelper.java
index 8e69dd1..955afc2 100644
--- a/server/src/com/cloud/api/query/ViewResponseHelper.java
+++ b/server/src/com/cloud/api/query/ViewResponseHelper.java
@@ -402,9 +402,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);
@@ -413,7 +413,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());
     }


Mime
View raw message