airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch group-based-auth updated: AIRAVATA-2797 Removing use of removed isNull flag
Date Wed, 06 Jun 2018 16:08:34 GMT
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 64b5678  AIRAVATA-2797 Removing use of removed isNull flag
64b5678 is described below

commit 64b567846647526d3309234f4d6cce2b83239f28
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Wed Jun 6 12:07:40 2018 -0400

    AIRAVATA-2797 Removing use of removed isNull flag
---
 .../registry/core/app/catalog/impl/UsrResourceProfileImpl.java      | 6 +-----
 .../registry/core/app/catalog/util/AppCatalogThriftConversion.java  | 6 ------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/UsrResourceProfileImpl.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/UsrResourceProfileImpl.java
index a7366ca..19a7f15 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/UsrResourceProfileImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/UsrResourceProfileImpl.java
@@ -177,11 +177,7 @@ public class UsrResourceProfileImpl implements UsrResourceProfile {
             List<AppCatalogResource> usercomputePrefList = prefResource.get(AppCatAbstractResource.UserComputeResourcePreferenceConstants.USER_ID,
ids);
             List<UserComputeResourcePreference> userComputeResourcePreferences = AppCatalogThriftConversion.getUserComputeResourcePreferences(usercomputePrefList);
             List<UserStoragePreference> dataStoragePreferences = getAllUserStoragePreferences(userId,gatewayId);
-            if(uResource != null){
-                return AppCatalogThriftConversion.getUserResourceProfile(uResource, userComputeResourcePreferences,
dataStoragePreferences);
-            }else{
-                return AppCatalogThriftConversion.createNullUserResourceProfile(userId, gatewayId);
-            }
+            return AppCatalogThriftConversion.getUserResourceProfile(uResource, userComputeResourcePreferences,
dataStoragePreferences);
         }catch (Exception e) {
             logger.error("Error while retrieving user resource profile...", e);
             throw new AppCatalogException(e);
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index 944ad77..063431b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -984,10 +984,4 @@ public class AppCatalogThriftConversion {
         userResourceProfile.setUserStoragePreferences(storagePreferences);
         return userResourceProfile;
     }
-
-    public static UserResourceProfile createNullUserResourceProfile(String userId, String
gatewayId){
-        UserResourceProfile userResourceProfile = new UserResourceProfile(userId, gatewayId);
-        userResourceProfile.setIsNull(true);
-        return userResourceProfile;
-    }
 }

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

Mime
View raw message