Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 101AC200C64 for ; Fri, 28 Apr 2017 17:22:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0EF6E160BB8; Fri, 28 Apr 2017 15:22:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C446A160BD4 for ; Fri, 28 Apr 2017 17:22:46 +0200 (CEST) Received: (qmail 13214 invoked by uid 500); 28 Apr 2017 15:22:45 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 11730 invoked by uid 99); 28 Apr 2017 15:22:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Apr 2017 15:22:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CD18E9655; Fri, 28 Apr 2017 15:22:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: machristie@apache.org To: commits@airavata.apache.org Date: Fri, 28 Apr 2017 15:23:24 -0000 Message-Id: <758eadd4a0db4559bdcbac0e13c97278@git.apache.org> In-Reply-To: <091dc838ebc045d68632ad7e8c9a48c6@git.apache.org> References: <091dc838ebc045d68632ad7e8c9a48c6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [43/50] [abbrv] airavata git commit: checking sharing is enabled archived-at: Fri, 28 Apr 2017 15:22:49 -0000 checking sharing is enabled Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/43c6736b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/43c6736b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/43c6736b Branch: refs/heads/develop Commit: 43c6736bd07b9420f0d9bc4c5d7f0da389ac0ace Parents: 2fb19efc Author: scnakandala Authored: Thu Apr 27 14:51:54 2017 -0400 Committer: scnakandala Committed: Thu Apr 27 14:51:54 2017 -0400 ---------------------------------------------------------------------- .../core/experiment/catalog/resources/WorkerResource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/43c6736b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java index 1d2c6db..ab3034c 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java @@ -19,6 +19,7 @@ */ package org.apache.airavata.registry.core.experiment.catalog.resources; +import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.model.status.ExperimentState; import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource; @@ -522,7 +523,7 @@ public class WorkerResource extends AbstractExpCatResource { for (String id : accessibleIds) query += ("'" + id + "'" + ","); query = query.substring(0, query.length() - 1) + ") AND "; - }else{ + }else if(ServerSettings.isEnableSharing() && (accessibleIds==null || accessibleIds.size()==0)){ return new ArrayList<>(); } @@ -615,7 +616,7 @@ public class WorkerResource extends AbstractExpCatResource { for (String id : accessibleIds) query += ("'" + id + "'" + ","); query = query.substring(0, query.length() - 1) + ") AND "; - }else{ + }else if(ServerSettings.isEnableSharing() && (accessibleIds==null || accessibleIds.size()==0)){ return new ArrayList<>(); }