Author: lahiru
Date: Wed Jan 9 22:47:54 2013
New Revision: 1431127
URL: http://svn.apache.org/viewvc?rev=1431127&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-711.
Modified:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/exception/ProviderException.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java
Modified:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/exception/ProviderException.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/exception/ProviderException.java?rev=1431127&r1=1431126&r2=1431127&view=diff
==============================================================================
---
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/exception/ProviderException.java
(original)
+++
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/exception/ProviderException.java
Wed Jan 9 22:47:54 2013
@@ -49,6 +49,6 @@ public class ProviderException extends G
if (additionalExceptiondata==null ||
additionalExceptiondata.length==0){
additionalExceptiondata=new
String[]{message,e.getLocalizedMessage()};
}
-
invocationContext.getExecutionContext().getNotifier().executionFail(invocationContext,e,additionalExceptiondata);
+//
invocationContext.getExecutionContext().getNotifier().executionFail(invocationContext,e,additionalExceptiondata);
}
}
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java?rev=1431127&r1=1431126&r2=1431127&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java
Wed Jan 9 22:47:54 2013
@@ -103,7 +103,10 @@ public class AsynchronousInvoker extends
}
// Gfac operation failed, so xbaya side throws this exception
if("ErrorResponse".equals(XMLUtil.stringToXmlElement3(this.getOutputMessage().toString()).getName())){
- throw new WorkflowException((String)
XMLUtil.stringToXmlElement3(this.getOutputMessage().toString()).children().next());
+ // Here we do not throw an exception, because if we throw an
exception Interpreter will catch it and do the unsubscription,
+ // which is not needed because if there's an gfac side error
gfac will send a failure and unsubscription will be done in monitoring
+ // so if we send an exception we are attempting to do two
unsubscriptions which will cause a one unsubscription to fail.
+ return false;
}
return true;