svn commit: r1436520 - in /airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: interpretor/WorkflowInterpreter.java invoker/EmbeddedGFacInvoker.java

[lahiru]

Author: lahiru
Date: Mon Jan 21 18:03:42 2013
New Revision: 1436520

URL: http://svn.apache.org/viewvc?rev=1436520&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-736

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

Modified: 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1436520&r1=1436519&r2=1436520&view=diff
==============================================================================
--- 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
 (original)
+++ 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
 Mon Jan 21 18:03:42 2013
@@ -290,8 +290,8 @@ public class WorkflowInterpreter {
                } catch (RuntimeException e) {
                        // we reset all the state
                        cleanup();
-                       this.config.getNotifier().cleanup();
             this.config.getNotifier().workflowFailed(e.getMessage());
+            this.config.getNotifier().cleanup();
                        
this.getWorkflow().setExecutionState(WorkflowExecutionState.NONE);
                        raiseException(e);
                } catch (AiravataAPIInvocationException e) {

Modified: 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1436520&r1=1436519&r2=1436520&view=diff
==============================================================================
--- 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
 (original)
+++ 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
 Mon Jan 21 18:03:42 2013
@@ -313,10 +313,14 @@ public class EmbeddedGFacInvoker impleme
             this.notifier.invocationFailed(message, e);
             throw new WorkflowException(message, e);
         } catch(ProviderException e){
-            this.notifier.invocationFailed(e.getMessage() + "\n" + 
e.getAditionalInfo()[0],e);
+            if (e.getAditionalInfo().length > 0) {
+                this.notifier.invocationFailed(e.getMessage() + "\n" + 
e.getAditionalInfo()[0], e);
+            } else {
+                this.notifier.invocationFailed(e.getMessage(), e);
+            }
             throw new WorkflowException(e.getMessage(), e);
         } catch (Exception e) {
-            this.notifier.invocationFailed(e.getMessage(),e);
+            this.notifier.invocationFailed(e.getMessage(), e);
             throw new WorkflowException(e.getMessage(), e);
         }
         return true;