You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2015/03/19 16:03:22 UTC
[56/62] [abbrv] airavata git commit: Missed a condition. AIRAVATA-1631
Missed a condition. AIRAVATA-1631
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/be1c6a0d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/be1c6a0d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/be1c6a0d
Branch: refs/heads/queue-gfac-rabbitmq
Commit: be1c6a0d07f1c0e4c21f7c082335703e1d940b3b
Parents: 5d7a034
Author: raminder <ra...@apache.org>
Authored: Mon Mar 16 14:38:26 2015 -0400
Committer: raminder <ra...@apache.org>
Committed: Mon Mar 16 14:38:26 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/be1c6a0d/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 6b20118..cc8a899 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
@@ -395,9 +395,8 @@ public class BetterGfacImpl implements GFac,Watcher {
if(objectType.getLocation().startsWith(File.separator)){
filePath = objectType.getLocation() + File.separator + filePath;
}else{
- filePath = jobExecutionContext.getOutputDir() + File.separator + filePath;
+ filePath = jobExecutionContext.getOutputDir() + File.separator + objectType.getLocation()+ filePath;
}
- filePath = objectType.getLocation()+ filePath;
}
objectType.setValue(filePath);