Author: lahiru
Date: Wed Oct 10 18:28:50 2012
New Revision: 1396720
URL: http://svn.apache.org/viewvc?rev=1396720&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-596.
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1396720&r1=1396719&r2=1396720&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
Wed Oct 10 18:28:50 2012
@@ -175,6 +175,11 @@ public class WorkflowInterpretorEventLis
} else if (type == MonitorUtil.EventType.WORKFLOW_TERMINATED) {
workflowFinished(graph, forward);
workflowStatusUpdater.workflowFinished(event.getExperimentID());
+ try {
+ this.unsubscribe();
+ } catch (MonitorException e) {
+ e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
+ }
} else if (type == EventType.INVOKING_SERVICE || type ==
EventType.SERVICE_INVOKED) {
if (node == null) {
logger.warn("There is no node that has ID, " + nodeID);
@@ -191,7 +196,7 @@ public class WorkflowInterpretorEventLis
logger.warn("There is no node that has ID, " + nodeID);
} else {
nodeFinished(node, forward);
-
workflowNodeStatusUpdater.workflowFinished(event.getExperimentID(),
event.getNodeID(),event.getMessage(),
+
workflowNodeStatusUpdater.workflowFinished(event.getExperimentID(),
event.getNodeID(), event.getMessage(),
event.getWorkflowID().toASCIIString());
}
} else if (type == EventType.INVOKING_SERVICE_FAILED || type ==
EventType.RECEIVED_FAULT
@@ -203,6 +208,11 @@ public class WorkflowInterpretorEventLis
nodeFailed(node, forward);
workflowNodeStatusUpdater.workflowFailed(event.getExperimentID(),
event.getNodeID());
}
+ try {
+ this.unsubscribe();
+ } catch (MonitorException e) {
+ e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
+ }
} else if (type == MonitorUtil.EventType.RESOURCE_MAPPING) {
if (node == null) {
logger.warn("There is no node that has ID, " + nodeID);