cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject git commit: updated refs/heads/4.2 to 2a6905a
Date Wed, 23 Oct 2013 10:52:15 GMT
Updated Branches:
  refs/heads/4.2 76dab960d -> 2a6905a9c


CLOUDSTACK-4927: ISO and Template test cases failing duing listiso api call

Removed check for deleted template/ISOs to throw exception as all list APIs returns empty
response on deleted entities


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2a6905a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2a6905a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2a6905a9

Branch: refs/heads/4.2
Commit: 2a6905a9ce5c6499a5632afb3d8b7e8af71ef7fa
Parents: 76dab96
Author: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Authored: Wed Oct 23 12:49:34 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Wed Oct 23 16:14:26 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/api/query/QueryManagerImpl.java | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a6905a9/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 9963d42..57b9ca9 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2763,10 +2763,6 @@ public class QueryManagerImpl extends ManagerBase implements QueryService
{
                 ex.addProxyObject(template.getUuid(), "templateId");
                 throw ex;
             }
-            if ((template == null) || ((template.getRemoved() != null) && !showRemovedTmpl)){
// If template is removed and showRemoved flag not turned -> throw exception. findbyId
returns removed template as well above.
-                s_logger.error("Please specify a valid template ID, template " + template.getUuid()
+ " is removed");
-                throw new InvalidParameterValueException("Please specify a valid template
ID " + template.getUuid());
-            }
 
             // if template is not public, perform permission check here
             if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYPE_ADMIN)
{


Mime
View raw message