[GitHub] rafaelweingartner closed pull request #1730: VMTemplateZone needs some love

[GitBox]

rafaelweingartner closed pull request #1730: VMTemplateZone needs some love
URL: https://github.com/apache/cloudstack/pull/1730
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java 
b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
index bffe2098641..21b3150bfd9 100644
--- 
a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
+++ 
b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
@@ -55,14 +55,14 @@ public VMTemplateZoneDaoImpl() {
     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 VMTemplateZoneVO findByZoneTemplate(long zoneId, long 
templateId) {
         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 void deletePrimaryRecordsForTemplate(long templateId) {
         txn.start();
         remove(sc);
         txn.commit();
-
     }
 
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services