Repository: airavata Updated Branches: refs/heads/develop 8e87d9811 -> 6fe8556f1
fixing AIRAVATA-2310 Storage resource does not work with gateway profile level credential store token Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6fe8556f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6fe8556f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6fe8556f Branch: refs/heads/develop Commit: 6fe8556f18d30b647584bce10ea51720eafca4bb Parents: 8e87d98 Author: scnakandala <[email protected]> Authored: Mon Jan 30 14:12:07 2017 -0500 Committer: scnakandala <[email protected]> Committed: Mon Jan 30 14:12:07 2017 -0500 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/core/context/ProcessContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6fe8556f/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java index e6b8d48..e057b71 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java @@ -463,8 +463,10 @@ public class ProcessContext { userStoragePreference != null && isValid(userStoragePreference.getResourceSpecificCredentialStoreToken())) { return userStoragePreference.getResourceSpecificCredentialStoreToken(); - }else { + } else if (isValid(gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken())) { return gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken(); + } else { + return gatewayResourceProfile.getCredentialStoreToken(); } }
