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

bug 6828: listIsos - Resolved listIsos returning multiple entries of the same ISO. 

status 6828: resolved fixed
This commit is contained in:
nit 2010-11-11 15:54:27 +05:30
parent 0597c0cf4b
commit c42449fe70
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/cloud/storage/dao/VMTemplateDaoImpl.java Normal file → Executable file
View File

@ -233,8 +233,8 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
accountType = Account.ACCOUNT_TYPE_ADMIN;
}
String guestOSJoin = "";
if (isIso) {
String guestOSJoin = "";
if (isIso && !hyperType.equals(HypervisorType.None)) {
guestOSJoin = " INNER JOIN guest_os guestOS on (guestOS.id = t.guest_os_id) INNER JOIN guest_os_hypervisor goh on ( goh.guest_os_id = guestOS.id) ";
}
@ -316,7 +316,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
}
if (isIso) {
sql += " t.format = 'ISO'";
sql += " t.format = 'ISO'";
if (!hyperType.equals(HypervisorType.None)) {
sql += " AND goh.hypervisor_type = '" + hyperType.toString() + "'";
}