airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject git commit: fix AIRAVATA-1439.
Date Wed, 17 Sep 2014 13:45:31 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 014c12384 -> ee1df1b4a


fix AIRAVATA-1439. 

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

Branch: refs/heads/master
Commit: ee1df1b4ad3c12901ef225b1515d190fe2e64bc2
Parents: 014c123
Author: raminder <raminder@apache.org>
Authored: Wed Sep 17 09:45:08 2014 -0400
Committer: raminder <raminder@apache.org>
Committed: Wed Sep 17 09:45:08 2014 -0400

----------------------------------------------------------------------
 .../apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/ee1df1b4/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
index b575157..193c2c5 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
@@ -132,7 +132,7 @@ public class AdvancedSCPOutputHandler extends AbstractHandler {
             ServerInfo serverInfo = new ServerInfo(this.userName, this.hostName);
 
             Cluster pbsCluster = new PBSCluster(serverInfo, authenticationInfo, CommonUtils.getPBSJobManager("/opt/torque/torque-4.2.3.1/bin/"));
-            if(!jobExecutionContext.getTaskData().getAdvancedOutputDataHandling().isPersistOutputData()){
+            if(jobExecutionContext.getTaskData().getAdvancedOutputDataHandling() != null
&& !jobExecutionContext.getTaskData().getAdvancedOutputDataHandling().isPersistOutputData()){
             outputPath = outputPath + File.separator + jobExecutionContext.getExperimentID()
+ "-" + jobExecutionContext.getTaskData().getTaskID()
                     + File.separator;
             pbsCluster.makeDirectory(outputPath);


Mime
View raw message