Updated Branches: refs/heads/4.3 58938d96d -> 97e47f884
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/97e47f88 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97e47f88 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97e47f88 Branch: refs/heads/4.3 Commit: 97e47f88471013a511e42e4d30e70d980134ca87 Parents: 58938d9 Author: Nitin Mehta <[email protected]> Authored: Mon Nov 25 13:47:42 2013 -0800 Committer: Nitin Mehta <[email protected]> Committed: Mon Nov 25 13:48:30 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/97e47f88/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 36fab21..58df38c 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -2850,7 +2850,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.
