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 2014/09/17 15:30:02 UTC
[1/2] git commit: Added a check to fix AIRAVATA-1439.
Repository: airavata
Updated Branches:
refs/heads/master 8abc4d3ca -> 014c12384
Added a check to 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/1e79c244
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1e79c244
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1e79c244
Branch: refs/heads/master
Commit: 1e79c244d30a2c157566cd57a022271a3397f357
Parents: 05b9be7
Author: raminder <ra...@apache.org>
Authored: Wed Sep 17 09:29:30 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Sep 17 09:29:30 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/1e79c244/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 116d769..b575157 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
@@ -119,7 +119,7 @@ public class AdvancedSCPOutputHandler extends AbstractHandler {
this.passPhrase);
}
// Server info
- if(jobExecutionContext.getTaskData().getAdvancedOutputDataHandling().getOutputDataDir() != null){
+ if(jobExecutionContext.getTaskData().getAdvancedOutputDataHandling() != null && jobExecutionContext.getTaskData().getAdvancedOutputDataHandling().getOutputDataDir() != null){
try{
URL outputPathURL = new URL(jobExecutionContext.getTaskData().getAdvancedOutputDataHandling().getOutputDataDir());
this.userName = outputPathURL.getUserInfo();
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/014c1238
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/014c1238
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/014c1238
Branch: refs/heads/master
Commit: 014c12384a0ced0ba1c4d33b5e6f8efd4aaf6f9a
Parents: 1e79c24 8abc4d3
Author: raminder <ra...@apache.org>
Authored: Wed Sep 17 09:29:47 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Sep 17 09:29:47 2014 -0400
----------------------------------------------------------------------
.../lib/airavata/experimentModel_types.cpp | 22 +-
.../lib/airavata/experimentModel_types.h | 23 +-
.../Model/Workspace/Experiment/Types.php | 20 +
.../client/samples/CreateLaunchExperiment.java | 588 ++++++++++---------
.../tools/RegisterSampleApplications.java | 109 +++-
.../experiment/UserConfigurationData.java | 104 +++-
.../experimentModel.thrift | 1 +
.../data/impl/ApplicationInterfaceImpl.java | 13 +-
.../catalog/data/impl/ComputeResourceImpl.java | 4 +-
.../data/impl/GwyResourceProfileImpl.java | 8 +-
.../src/main/resources/registry-derby.sql | 2 +-
11 files changed, 589 insertions(+), 305 deletions(-)
----------------------------------------------------------------------