You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/12/30 22:19:17 UTC
airavata git commit: Handled null values with user preferences
Repository: airavata
Updated Branches:
refs/heads/develop 1480cd3b4 -> 9fc238dec
Handled null values with user preferences
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9fc238de
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9fc238de
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9fc238de
Branch: refs/heads/develop
Commit: 9fc238dec83505e0ab2417679dfd1b93446a7871
Parents: 1480cd3
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Dec 30 17:19:12 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Dec 30 17:19:12 2016 -0500
----------------------------------------------------------------------
.../apache/airavata/gfac/core/context/ProcessContext.java | 8 ++++++--
.../org/apache/airavata/gfac/server/GfacServerHandler.java | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9fc238de/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 ffe400a..ab9aa56 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
@@ -443,7 +443,9 @@ public class ProcessContext {
}
public String getComputeResourceCredentialToken(){
- if (isUseUserCRPref() && isValid(userComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
+ if (isUseUserCRPref() &&
+ userComputeResourcePreference != null &&
+ isValid(userComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
return userComputeResourcePreference.getResourceSpecificCredentialStoreToken();
} else if (isValid(gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
return gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken();
@@ -453,7 +455,9 @@ public class ProcessContext {
}
public String getStorageResourceCredentialToken(){
- if (isUseUserCRPref() && isValid(userStoragePreference.getResourceSpecificCredentialStoreToken())) {
+ if (isUseUserCRPref() &&
+ userStoragePreference != null &&
+ isValid(userStoragePreference.getResourceSpecificCredentialStoreToken())) {
return userStoragePreference.getResourceSpecificCredentialStoreToken();
}else {
return gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken();
http://git-wip-us.apache.org/repos/asf/airavata/blob/9fc238de/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index a176198..029384e 100644
--- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -172,7 +172,7 @@ public class GfacServerHandler implements GfacService.Iface {
throw new TException("Failed to submit process due to credential issue, " +
"make sure you are passing a valid credential token", e);
} catch (Exception e) {
- log.error("Error creating zookeeper nodes");
+ log.error("Error creating zookeeper nodes", e);
throw new TException("Error creating zookeeper nodes", e);
}
return true;