svn commit: r1479681 - /airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java

[la...@apache.org]

Author: lahiru
Date: Mon May  6 19:11:48 2013
New Revision: 1479681

URL: http://svn.apache.org/r1479681
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-841.

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=1479681&r1=1479680&r2=1479681&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 Mon May  6 19:11:48 2013
@@ -71,6 +71,7 @@ public class WorkflowInterpretorEventLis
     private WorkflowStatusUpdater workflowStatusUpdater;
     private WorkflowNodeStatusUpdater workflowNodeStatusUpdater;
     private WorkflowInterpreterConfiguration workflowInterpreterConfiguration;
+    private String lastSubscriptionId;
 
     private static Logger logger = LoggerFactory.getLogger(WorkflowInterpretorEventListener.class);
 
@@ -135,9 +136,7 @@ public class WorkflowInterpretorEventLis
             }
             this.wseClient.unSubscribe(this.subscriptionID);
         } catch (MsgBrokerClientException e) {
-            // We do not throw exception because we unsubscribe for all the failures, there could be multiple failure messages
-            //for a given case.
-            logger.info("Given subscription is already unsubscribed.");
+            throw new MonitorException("Failed to unsubscribe.", e);
         }
 
     }
@@ -204,8 +203,7 @@ public class WorkflowInterpretorEventLis
                 workflowNodeStatusUpdater.workflowFinished(event.getExperimentID(), event.getNodeID(), event.getMessage(),
                         event.getWorkflowID().toASCIIString());
             }
-        } else if (type == EventType.INVOKING_SERVICE_FAILED || type == EventType.RECEIVED_FAULT
-        // TODO
+        } else if (type == EventType.RECEIVED_FAULT
                 || type == EventType.SENDING_FAULT || type == EventType.SENDING_RESPONSE_FAILED) {
             if (node == null) {
             	if (nodeID!=null && !nodeID.equals("")) {