Return-Path: 
 <commits-return-41125-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A7DC5114DC
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu,  1 May 2014 23:04:40 +0000 (UTC)
Received: (qmail 52119 invoked by uid 500); 1 May 2014 23:04:34 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 51987 invoked by uid 500); 1 May 2014 23:04:32 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 51851 invoked by uid 99); 1 May 2014 23:04:30 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 23:04:30 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 8CED9674F; Thu,  1 May 2014 23:04:29 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mchen@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 01 May 2014 23:04:34 -0000
Message-Id: <14244f47ea2a49d282f3a2e3524aed13@git.apache.org>
In-Reply-To: <2728214d81a942c48736d46eed8b85c2@git.apache.org>
References: <2728214d81a942c48736d46eed8b85c2@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [06/10] git commit: updated refs/heads/master to 134a799

CLOUDSTACK-6513: remove commented code.


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

Branch: refs/heads/master
Commit: 2521fd482b74f8050c574a95bd3afa389e7650de
Parents: db9aee4
Author: Min Chen <min.chen@citrix.com>
Authored: Wed Apr 30 10:03:06 2014 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu May 1 15:57:28 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2521fd48/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 8047ea6..8e020fc 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3346,11 +3346,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
                     sc.addAnd("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
                 }
             } else if (templateFilter == TemplateFilter.sharedexecutable || templateFilter == TemplateFilter.shared) {
+                // only show templates shared by others
                 sc.addAnd("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
-//                SearchCriteria<TemplateJoinVO> scc = _templateJoinDao.createSearchCriteria();
-//                scc.addOr("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
-//                scc.addOr("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
-//                sc.addAnd("accountId", SearchCriteria.Op.SC, scc);
             } else if (templateFilter == TemplateFilter.executable) {
                 SearchCriteria<TemplateJoinVO> scc = _templateJoinDao.createSearchCriteria();
                 scc.addOr("publicTemplate", SearchCriteria.Op.EQ, true);