rhtyd closed pull request #2308: CLOUDSTACK-8908 After copying the template charging for that template is stopped URL: https://github.com/apache/cloudstack/pull/2308
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/com/cloud/usage/dao/UsageStorageDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java index 45337b22e13..ad8ce59dba7 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java @@ -66,6 +66,7 @@ public UsageStorageDaoImpl() { IdZoneSearch.and("id", IdZoneSearch.entity().getId(), SearchCriteria.Op.EQ); IdZoneSearch.and("type", IdZoneSearch.entity().getStorageType(), SearchCriteria.Op.EQ); IdZoneSearch.and("dcId", IdZoneSearch.entity().getZoneId(), SearchCriteria.Op.EQ); + IdZoneSearch.and("deleted", IdZoneSearch.entity().getDeleted(), SearchCriteria.Op.NULL); IdZoneSearch.done(); } @@ -85,6 +86,7 @@ public UsageStorageDaoImpl() { sc.setParameters("id", id); sc.setParameters("type", type); sc.setParameters("dcId", dcId); + sc.setParameters("deleted", null); return listBy(sc, null); } ---------------------------------------------------------------- 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