[airavata] branch group-based-auth updated: When getting all app deployments, don't filter by accessibleAppDeploymentIds

[machristie]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/group-based-auth by this push:
     new e93a09d  When getting all app deployments, don't filter by 
accessibleAppDeploymentIds
e93a09d is described below

commit e93a09decbcd541fa9ea3851493d59678add9b84
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Thu Feb 22 09:20:19 2018 -0500

    When getting all app deployments, don't filter by accessibleAppDeploymentIds
---
 .../registry/core/app/catalog/resources/AppDeploymentResource.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java
index 0e04281..9b7b01f 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java
@@ -317,7 +317,9 @@ public class AppDeploymentResource extends 
AppCatAbstractResource {
             em.getTransaction().begin();
             AppCatalogQueryGenerator generator = new 
AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT);
             generator.setParameter(ApplicationDeploymentConstants.GATEWAY_ID, 
gatewayId);
-            
generator.setParameter(ApplicationDeploymentConstants.DEPLOYMENT_ID, 
accessibleAppDeploymentIds);
+            if (accessibleAppDeploymentIds != null && 
!accessibleAppDeploymentIds.isEmpty()) {
+                
generator.setParameter(ApplicationDeploymentConstants.DEPLOYMENT_ID, 
accessibleAppDeploymentIds);
+            }
             Query q = generator.selectQuery(em);
             List results = q.getResultList();
                 if (results.size() != 0) {

-- 
To stop receiving notification emails like this one, please contact
machris...@apache.org.