airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata git commit: Fix for setting usage reporting id.
Date Tue, 07 Feb 2017 20:17:48 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 52ae8349b -> b5ae4dc96


Fix for setting usage reporting id.


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

Branch: refs/heads/develop
Commit: b5ae4dc96e64a61059e57bd6e104d9b1bec76b98
Parents: 52ae834
Author: Ajinkya Dhamnaskar <adhamnas@umail.iu.edu>
Authored: Tue Feb 7 14:52:56 2017 -0500
Committer: Ajinkya Dhamnaskar <adhamnas@umail.iu.edu>
Committed: Tue Feb 7 14:52:56 2017 -0500

----------------------------------------------------------------------
 .../core/app/catalog/util/AppCatalogThriftConversion.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/b5ae4dc9/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
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 4cb76ca..b20c736 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
@@ -848,7 +848,11 @@ public class AppCatalogThriftConversion {
         preference.setAllocationProjectNumber(resource.getProjectNumber());
         preference.setLoginUserName(resource.getLoginUserName());
         preference.setResourceSpecificCredentialStoreToken(resource.getResourceCSToken());
-        preference.setUsageReportingGatewayId(resource.getUsageReportingGatewayId());
+        if( null != resource.getUsageReportingGatewayId()){
+            preference.setUsageReportingGatewayId(resource.getUsageReportingGatewayId());
+        }else {
+            preference.setUsageReportingGatewayId(resource.getGatewayId());
+        }
         preference.setQualityOfService(resource.getQualityOfService());
         preference.setReservation(resource.getReservation());
         if (resource.getReservationStartTime() != null) {


Mime
View raw message