Repository: airavata Updated Branches: refs/heads/master b6312d9aa -> e48a02eaf
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/master Commit: 43c6736bd07b9420f0d9bc4c5d7f0da389ac0ace Parents: 2fb19efc Author: scnakandala <[email protected]> Authored: Thu Apr 27 14:51:54 2017 -0400 Committer: scnakandala <[email protected]> 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<>(); }
