Updated Branches: refs/heads/master 5a9b4ee84 -> a1ca4f1d5
CLOUDSTACK-5221: In order to keep backward compatibility, listisos should return an empty response than an error when id of a removed iso is passed. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1ca4f1d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1ca4f1d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1ca4f1d Branch: refs/heads/master Commit: a1ca4f1d5669861b938858add4cbf7c6e0fb5a8c Parents: 5a9b4ee Author: Nitin Mehta <[email protected]> Authored: Mon Nov 25 13:47:42 2013 -0800 Committer: Nitin Mehta <[email protected]> Committed: Mon Nov 25 13:47:42 2013 -0800 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1ca4f1d/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index bda7b4d..9122276 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -2769,7 +2769,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { // verify templateId parameter and specially handle it if (templateId != null) { - template = _templateDao.findById(templateId); + template = _templateDao.findByIdIncludingRemoved(templateId); // Done for backward compatibility - Bug-5221 if (template == null) { throw new InvalidParameterValueException("Please specify a valid template ID."); }// If ISO requested then it should be ISO.
