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 2012/10/18 18:28:09 UTC
svn commit: r1399726 -
/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Author: raminder
Date: Thu Oct 18 16:28:09 2012
New Revision: 1399726
URL: http://svn.apache.org/viewvc?rev=1399726&view=rev
Log:
readProvenance method is not used. Changed reviewed with Lahiru. AIRAVATA-601
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1399726&r1=1399725&r2=1399726&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Thu Oct 18 16:28:09 2012
@@ -230,16 +230,16 @@ public class WorkflowInterpreter {
// want
// recalculate the execution stack
}
-
- boolean nodeOutputLoadedFromProvenance = false;
- if (this.config.isActOnProvenance()) {
- nodeOutputLoadedFromProvenance = readProvenance(node);
- if (!nodeOutputLoadedFromProvenance) {
- executeDynamically(node);
- }
- } else {
+//
+// boolean nodeOutputLoadedFromProvenance = false;
+// if (this.config.isActOnProvenance()) {
+// nodeOutputLoadedFromProvenance = readProvenance(node);
+// if (!nodeOutputLoadedFromProvenance) {
+// executeDynamically(node);
+// }
+// } else {
executeDynamically(node);
- }
+// }
if (this.getWorkflow().getExecutionState() == WorkflowExecutionState.STEP) {
this.getWorkflow().setExecutionState(WorkflowExecutionState.PAUSED);
break;
@@ -363,8 +363,14 @@ public class WorkflowInterpreter {
for (int i = 0; i < inputPorts.size(); ++i) {
String inputTagname = inputPorts.get(i).getName();
// cordinate return
+ if(node instanceof DoWhileNode){
+ inputs[i] = new Pair<String, String>(inputTagname, "<" + inputTagname + ">"
+ + InterpreterUtil.findInputFromPort(inputPorts.get(i), this.invokerMap).toString() + "</" + inputTagname + ">");
+ break;
+ }else{
inputs[i] = new Pair<String, String>(inputTagname, "<" + inputTagname + ">"
+ InterpreterUtil.findInputFromPort(inputPorts.get(i), this.invokerMap).toString() + "</" + inputTagname + ">");
+ }
}
String output = ((String) new ProvenanceReader(node, this.config.getTopic(), this.config.getRegistry()).read());
@@ -1495,7 +1501,7 @@ public class WorkflowInterpreter {
controlDone = controlDone && (finishedNodes.contains(edge.getFromPort().getNode())
// amazon component use condition met to check
// whether the control port is done
- // FIXME I changed the "||" to a "&&" in the following since thats the only this
+ // FIXME I changed the "||" to a "&&" in the following since thats the only this
// that makes sense and if anyone found a scenario it should be otherwise pls fix
|| ((ControlPort) edge.getFromPort()).isConditionMet());
}