You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2015/03/17 17:41:42 UTC
airavata git commit: Changed according to AIRAVATA-1634 in clone fix.
AIRAVATA-1631
Repository: airavata
Updated Branches:
refs/heads/master f70830444 -> 7d57c0986
Changed according to AIRAVATA-1634 in clone fix. AIRAVATA-1631
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7d57c098
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7d57c098
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7d57c098
Branch: refs/heads/master
Commit: 7d57c09865be7da0dff3ec506e5b6bd00cbf9268
Parents: f708304
Author: raminder <ra...@apache.org>
Authored: Tue Mar 17 12:41:28 2015 -0400
Committer: raminder <ra...@apache.org>
Committed: Tue Mar 17 12:41:28 2015 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7d57c098/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 5dcea2e..9c3e049 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -385,18 +385,16 @@ public class BetterGfacImpl implements GFac,Watcher {
for (OutputDataObjectType objectType : taskOutputs){
if (objectType.getType() == DataType.URI && objectType.getValue() != null){
- // this should be also the relative path : in case of clone, this will contain full path
String filePath = objectType.getValue();
- if(objectType.getLocation() == null && objectType.getLocation().isEmpty() && filePath.contains(File.separator)){
- filePath = jobExecutionContext.getOutputDir() + File.separator + filePath.substring(filePath.lastIndexOf(File.separatorChar) + 1, filePath.length());
- }
- //output is not in working folder
+ // if output is not in working folder
if (objectType.getLocation() != null && !objectType.getLocation().isEmpty()) {
if(objectType.getLocation().startsWith(File.separator)){
filePath = objectType.getLocation() + File.separator + filePath;
}else{
filePath = jobExecutionContext.getOutputDir() + File.separator + objectType.getLocation() + File.separator + filePath;
}
+ }else{
+ filePath = jobExecutionContext.getOutputDir() + File.separator + filePath;
}
objectType.setValue(filePath);