apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

VMTemplateZone needs some love (#1730)

Browse Source 
It's incorrect to use the findIncludingRemovedBy and
listIncludingRemovedBy for the common list and find operation.

Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
This commit is contained in:
Marc-Aurèle Brothier 2019-01-10 11:55:09 +01:00 committed by Rafael Weingärtner
parent 301330528c
commit cea8036732
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
View File

@ -55,14 +55,14 @@ public class VMTemplateZoneDaoImpl extends GenericDaoBase<VMTemplateZoneVO, Long
public List<VMTemplateZoneVO> listByZoneId(long id) {
SearchCriteria<VMTemplateZoneVO> sc = ZoneSearch.create();
sc.setParameters("zone_id", id);
return listIncludingRemovedBy(sc);
return listBy(sc);
}
@Override
public List<VMTemplateZoneVO> listByTemplateId(long templateId) {
SearchCriteria<VMTemplateZoneVO> sc = TemplateSearch.create();
sc.setParameters("template_id", templateId);
return listIncludingRemovedBy(sc);
return listBy(sc);
}
@Override
@ -70,7 +70,7 @@ public class VMTemplateZoneDaoImpl extends GenericDaoBase<VMTemplateZoneVO, Long
SearchCriteria<VMTemplateZoneVO> sc = ZoneTemplateSearch.create();
sc.setParameters("zone_id", zoneId);
sc.setParameters("template_id", templateId);
return findOneIncludingRemovedBy(sc);
return findOneBy(sc);
}
@Override
@ -91,7 +91,6 @@ public class VMTemplateZoneDaoImpl extends GenericDaoBase<VMTemplateZoneVO, Long
txn.start();
remove(sc);
txn.commit();
}
}