You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/06/11 04:37:00 UTC
svn commit: r1348710 -
/incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Author: lahiru
Date: Mon Jun 11 02:36:59 2012
New Revision: 1348710
URL: http://svn.apache.org/viewvc?rev=1348710&view=rev
Log:
fixing build error.
Modified:
incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Modified: incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1348710&r1=1348709&r2=1348710&view=diff
==============================================================================
--- incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/branches/0.3-incubating-snapshot/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Mon Jun 11 02:36:59 2012
@@ -339,14 +339,14 @@ public class WorkflowInterpreter {
}
boolean nodeOutputLoadedFromProvenance = false;
- if (this.actOnProvenance) {
- nodeOutputLoadedFromProvenance = readProvenance(node);
- } else {
- writeProvenanceLater(node);
- }
- if (!nodeOutputLoadedFromProvenance) {
- executeDynamically(node);
- }
+ if (this.actOnProvenance) {
+ nodeOutputLoadedFromProvenance = readProvenance(node);
+ if (!nodeOutputLoadedFromProvenance) {
+ executeDynamically(node);
+ }
+ }else{
+ executeDynamically(node);
+ }
if (this.getWorkflow().getExecutionState() == XBayaExecutionState.STEP) {
this.getWorkflow().setExecutionState(
XBayaExecutionState.PAUSED);
@@ -469,9 +469,7 @@ public class WorkflowInterpreter {
String output = ((String)new ProvenanceReader(node,this.topic,this.configuration
.getJcrComponentRegistry()
.getRegistry()).read());
- if(output == null){
- writeProvenanceLater(node);
- } else {
+ if(output != null){
XmlElement result = XMLUtil.stringToXmlElement(output);
SystemComponentInvoker invoker = new SystemComponentInvoker();
List<DataPort> outPorts = node.getOutputPorts();
@@ -493,7 +491,9 @@ public class WorkflowInterpreter {
this.invokerMap.put(node, invoker);
node.getGUI().setBodyColor(NodeState.FINISHED.color);
return true;
- }
+ }else{
+ writeProvenanceLater(node);
+ }
} catch (Exception e) {
throw new XBayaRuntimeException(e);
}