incubator-airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1239208 - /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Date Wed, 01 Feb 2012 17:06:19 GMT
Author: lahiru
Date: Wed Feb  1 17:06:19 2012
New Revision: 1239208

URL: http://svn.apache.org/viewvc?rev=1239208&view=rev
Log:
do the cleanup right time avoiding workflow Rerun error.

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=1239208&r1=1239207&r2=1239208&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
Wed Feb  1 17:06:19 2012
@@ -409,6 +409,7 @@ public class WorkflowInterpreter {
 					e.printStackTrace();
 				}
 				cleanup();
+                this.notifier.cleanup();
 				waitDialog.hide();
 			} else {
 				finish();
@@ -417,6 +418,7 @@ public class WorkflowInterpreter {
 		} catch (RuntimeException e) {
 			// we reset all the state
 			cleanup();
+            this.notifier.cleanup();
             this.workflow.setExecutionState(XBayaExecutionState.NONE);
             raiseException(e);
         }
@@ -526,7 +528,7 @@ public class WorkflowInterpreter {
      * @throws MonitorException
      */
     public void cleanup() throws MonitorException {
-        this.workflow.setExecutionState(XBayaExecutionState.STOPPED);
+            this.workflow.setExecutionState(XBayaExecutionState.STOPPED);
 		if (this.mode == GUI_MODE) {
 			this.engine.resetWorkflowInterpreter();
 			try {
@@ -535,7 +537,6 @@ public class WorkflowInterpreter {
 				this.engine.getMonitor().reset();
 			}
 		}
-        this.notifier.cleanup();
 	}
 
 	private void sendOutputsDynamically() throws XBayaException {
@@ -648,6 +649,8 @@ public class WorkflowInterpreter {
 		this.notifier.sendingPartialResults(outputValues.toArray(),
 				outputKeywords.toArray(new String[outputKeywords.size()]));
         cleanup();
+        this.notifier.cleanup();
+
 	}
 
 	private void executeDynamically(final Node node) throws XBayaException {



Mime
View raw message