airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject airavata git commit: Fixed - use task input and output instead of experiment input and output in BetterGfacImpl
Date Wed, 26 Nov 2014 06:11:55 GMT
Repository: airavata
Updated Branches:
  refs/heads/master b30577739 -> 7857e9a1e


Fixed - use task input and output instead of experiment input and output in BetterGfacImpl


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

Branch: refs/heads/master
Commit: 7857e9a1ecaaf75bfbfba5f6b2263783b9f39c04
Parents: b305777
Author: shamrath <shameerainfo@gmail.com>
Authored: Wed Nov 26 01:11:56 2014 -0500
Committer: shamrath <shameerainfo@gmail.com>
Committed: Wed Nov 26 01:11:56 2014 -0500

----------------------------------------------------------------------
 .../airavata/gfac/core/cpi/BetterGfacImpl.java      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/7857e9a1/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 f9da398..aaa5461 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
@@ -297,14 +297,18 @@ public class BetterGfacImpl implements GFac,Watcher {
         applicationContext.setComputeResourcePreference(gatewayResourcePreferences);
         jobExecutionContext.setApplicationContext(applicationContext);
 
-        List<InputDataObjectType> experimentInputs = experiment.getExperimentInputs();
-        jobExecutionContext.setInMessageContext(new MessageContext(GFacUtils.getInputParamMap(experimentInputs)));
 
-        List<OutputDataObjectType> outputData = experiment.getExperimentOutputs();
-        if (outputData == null || outputData.isEmpty() ){
-            outputData = applicationInterface.getApplicationOutputs();
+//        List<InputDataObjectType> experimentInputs = experiment.getExperimentInputs();
+//        jobExecutionContext.setInMessageContext(new MessageContext(GFacUtils.getInputParamMap(experimentInputs)));
+        List<InputDataObjectType> taskInputs = taskData.getApplicationInputs();
+        jobExecutionContext.setInMessageContext(new MessageContext(GFacUtils.getInputParamMap(taskInputs)));
+
+//        List<OutputDataObjectType> outputData = experiment.getExperimentOutputs();
+        List<OutputDataObjectType> taskOutputs = taskData.getApplicationOutputs();
+        if (taskOutputs == null || taskOutputs.isEmpty() ){
+            taskOutputs = applicationInterface.getApplicationOutputs();
         }
-        jobExecutionContext.setOutMessageContext(new MessageContext(GFacUtils.getOuputParamMap(outputData)));
+        jobExecutionContext.setOutMessageContext(new MessageContext(GFacUtils.getOuputParamMap(taskOutputs)));
 
         jobExecutionContext.setProperty(Constants.PROP_TOPIC, experimentID);
         jobExecutionContext.setGfac(this);


Mime
View raw message