cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [4/6] git commit: updated refs/heads/object_store to 8a514ea
Date Wed, 08 May 2013 00:45:26 GMT
Fix an issue in showing removed templates in list call.


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

Branch: refs/heads/object_store
Commit: e8c69632b6cbc6656b5c9296cbd3cf3dc8b14339
Parents: bc97dbd
Author: Min Chen <min.chen@citrix.com>
Authored: Tue May 7 16:44:05 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Tue May 7 17:45:06 2013 -0700

----------------------------------------------------------------------
 .../src/com/cloud/api/query/QueryManagerImpl.java  |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8c69632/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 a79a2b2..807f2d6 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2681,6 +2681,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService
{
                 sc.addAnd("templateType", SearchCriteria.Op.NEQ, Storage.TemplateType.SYSTEM);
             }
 
+            // don't return removed template
+            sc.addAnd("removed", SearchCriteria.Op.NULL);
+
             // search unique templates and find details by Ids
             Pair<List<TemplateJoinVO>, Integer> uniqueTmplPair = _templateJoinDao.searchAndCount(sc,
searchFilter);
             Integer count = uniqueTmplPair.second();


Mime
View raw message