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 2017/01/03 20:08:49 UTC
airavata git commit: Handled null values with user preferences part 2
Repository: airavata
Updated Branches:
refs/heads/develop 9fc238dec -> c4f1141c5
Handled null values with user preferences part 2
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c4f1141c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c4f1141c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c4f1141c
Branch: refs/heads/develop
Commit: c4f1141c5c1c1dc26e774bf6b4f9998f5e8ff4bb
Parents: 9fc238d
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Jan 3 15:07:16 2017 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jan 3 15:07:16 2017 -0500
----------------------------------------------------------------------
.../gfac/core/context/ProcessContext.java | 44 +++++++++++++-------
1 file changed, 30 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4f1141c/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 ab9aa56..e6b8d48 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
@@ -186,7 +186,9 @@ public class ProcessContext {
public String getScratchLocation() {
if (scratchLocation == null) {
- if (processModel.isUseUserCRPref() && isValid(userComputeResourcePreference.getScratchLocation())) {
+ if (isUseUserCRPref() &&
+ userComputeResourcePreference != null &&
+ isValid(userComputeResourcePreference.getScratchLocation())) {
scratchLocation = userComputeResourcePreference.getScratchLocation();
} else if (isValid(processModel.getProcessResourceSchedule().getOverrideScratchLocation())) {
scratchLocation = processModel.getProcessResourceSchedule().getOverrideScratchLocation();
@@ -435,7 +437,9 @@ public class ProcessContext {
}
public String getComputeResourceId() {
- if (isUseUserCRPref()) {
+ if (isUseUserCRPref() &&
+ userComputeResourcePreference != null &&
+ isValid(userComputeResourcePreference.getComputeResourceId())) {
return userComputeResourcePreference.getComputeResourceId();
} else {
return gatewayComputeResourcePreference.getComputeResourceId();
@@ -588,7 +592,9 @@ public class ProcessContext {
}
public String getComputeResourceLoginUserName(){
- if (isUseUserCRPref() && isValid(userComputeResourcePreference.getLoginUserName())) {
+ if (isUseUserCRPref() &&
+ userComputeResourcePreference != null &&
+ isValid(userComputeResourcePreference.getLoginUserName())) {
return userComputeResourcePreference.getLoginUserName();
} else if (isValid(processModel.getProcessResourceSchedule().getOverrideLoginUserName())) {
return processModel.getProcessResourceSchedule().getOverrideLoginUserName();
@@ -598,7 +604,9 @@ public class ProcessContext {
}
public String getStorageResourceLoginUserName(){
- if (isUseUserCRPref() && isValid(userStoragePreference.getLoginUserName())) {
+ if (isUseUserCRPref() &&
+ userStoragePreference != null &&
+ isValid(userStoragePreference.getLoginUserName())) {
return userStoragePreference.getLoginUserName();
} else {
return gatewayStorageResourcePreference.getLoginUserName();
@@ -606,7 +614,9 @@ public class ProcessContext {
}
public String getStorageFileSystemRootLocation(){
- if (userStoragePreference != null && isValid(userStoragePreference.getFileSystemRootLocation())) {
+ if (isUseUserCRPref() &&
+ userStoragePreference != null &&
+ isValid(userStoragePreference.getFileSystemRootLocation())) {
return userStoragePreference.getFileSystemRootLocation();
} else {
return gatewayStorageResourcePreference.getFileSystemRootLocation();
@@ -614,7 +624,9 @@ public class ProcessContext {
}
public String getStorageResourceId() {
- if (userStoragePreference != null && isValid(userStoragePreference.getStorageResourceId())) {
+ if (isUseUserCRPref() &&
+ userStoragePreference != null &&
+ isValid(userStoragePreference.getStorageResourceId())) {
return userStoragePreference.getStorageResourceId();
} else {
return gatewayStorageResourcePreference.getStorageResourceId();
@@ -656,12 +668,12 @@ public class ProcessContext {
public String getReservation() {
long start = 0, end = 0;
String reservation = null;
- if (isUseUserCRPref() && isValid(userComputeResourcePreference.getLoginUserName())) {
- if (isValid(userComputeResourcePreference.getReservation())) {
- reservation = userComputeResourcePreference.getReservation();
- start = userComputeResourcePreference.getReservationStartTime();
- end = userComputeResourcePreference.getReservationEndTime();
- }
+ if (isUseUserCRPref() &&
+ userComputeResourcePreference != null &&
+ isValid(userComputeResourcePreference.getReservation())) {
+ reservation = userComputeResourcePreference.getReservation();
+ start = userComputeResourcePreference.getReservationStartTime();
+ end = userComputeResourcePreference.getReservationEndTime();
} else {
reservation = gatewayComputeResourcePreference.getReservation();
start = gatewayComputeResourcePreference.getReservationStartTime();
@@ -677,7 +689,9 @@ public class ProcessContext {
}
public String getQualityOfService() {
- if (isUseUserCRPref() && isValid(userComputeResourcePreference.getLoginUserName())) {
+ if (isUseUserCRPref() &&
+ userComputeResourcePreference != null &&
+ isValid(userComputeResourcePreference.getQualityOfService())) {
return userComputeResourcePreference.getQualityOfService();
} else {
return gatewayComputeResourcePreference.getQualityOfService();
@@ -686,7 +700,9 @@ public class ProcessContext {
public String getQueueName() {
- if (isUseUserCRPref() && isValid(userComputeResourcePreference.getPreferredBatchQueue())) {
+ if (isUseUserCRPref() &&
+ userComputeResourcePreference != null &&
+ isValid(userComputeResourcePreference.getPreferredBatchQueue())) {
return userComputeResourcePreference.getPreferredBatchQueue();
} else if (isValid(processModel.getProcessResourceSchedule().getQueueName())) {
return processModel.getProcessResourceSchedule().getQueueName();