airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject airavata git commit: changing output data staging according to - AIRAVATA-1909
Date Wed, 16 Mar 2016 00:36:30 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop a9a331a85 -> 63d742bdc


changing output data staging according to - AIRAVATA-1909


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/63d742bd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/63d742bd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/63d742bd

Branch: refs/heads/develop
Commit: 63d742bdc438ebc948586e64437657282b7230a3
Parents: a9a331a
Author: Suresh Marru <smarru@apache.org>
Authored: Tue Mar 15 20:36:23 2016 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Tue Mar 15 20:36:23 2016 -0400

----------------------------------------------------------------------
 .../apache/airavata/gfac/impl/task/SCPDataStageTask.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/63d742bd/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
index 0df3c4e..22281de 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
@@ -287,16 +287,15 @@ public class SCPDataStageTask implements Task {
 
     public URI getDestinationURI(TaskContext taskContext, String fileName) throws URISyntaxException
{
         String experimentDataDir = taskContext.getParentProcessContext().getProcessModel().getExperimentDataDir();
-        String filePath;
+        String filePath = "";
         if(experimentDataDir != null && !experimentDataDir.isEmpty()) {
-            if(experimentDataDir.startsWith(File.separator)){
-                experimentDataDir = experimentDataDir.substring(1);
-            }
             if(!experimentDataDir.endsWith(File.separator)){
                 experimentDataDir += File.separator;
             }
-           filePath = (inputPath.endsWith(File.separator) ? inputPath : inputPath + File.separator)
+ experimentDataDir +
-                    taskContext.getParentProcessContext().getProcessId() + File.separator
+ fileName;
+            if(!experimentDataDir.startsWith(File.separator)){
+                filePath = (inputPath.endsWith(File.separator) ? inputPath : inputPath +
File.separator);
+            }
+           filePath = filePath + experimentDataDir + fileName;
         } else {
            filePath =(inputPath.endsWith(File.separator) ? inputPath : inputPath + File.separator)
+
                     taskContext.getParentProcessContext().getProcessId() + File.separator
+ fileName;


Mime
View raw message