airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1348717 - /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Date Mon, 11 Jun 2012 03:57:01 GMT
Author: samindaw
Date: Mon Jun 11 03:57:00 2012
New Revision: 1348717

URL: http://svn.apache.org/viewvc?rev=1348717&view=rev
Log:
patch by lahiru

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1348717&r1=1348716&r2=1348717&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Mon Jun 11 03:57:00 2012
@@ -332,10 +332,10 @@ public class WorkflowInterpreter {
 					boolean nodeOutputLoadedFromProvenance = false;
 					if (this.config.isActOnProvenance()) {
 						nodeOutputLoadedFromProvenance = readProvenance(node);
-						} else {
-						writeProvenanceLater(node);
-					}
-					if (!nodeOutputLoadedFromProvenance) {
+						if (!nodeOutputLoadedFromProvenance) {
+							executeDynamically(node);
+						}
+					}else{
 						executeDynamically(node);
 					}
 					if (this.getWorkflow().getExecutionState() == WorkflowExecutionState.STEP) {
@@ -474,9 +474,7 @@ public class WorkflowInterpreter {
 			}
 
 			String output = ((String)new ProvenanceReader(node,this.config.getTopic(),this.config.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();
@@ -498,6 +496,8 @@ public class WorkflowInterpreter {
 				this.invokerMap.put(node, invoker);
 				NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 				return true;
+			}else{
+				writeProvenanceLater(node);
 			}
 		} catch (Exception e) {
 			throw new WorkflowRuntimeException(e);



Mime
View raw message