Author: samindaw
Date: Tue Oct 9 16:02:05 2012
New Revision: 1396087
URL: http://svn.apache.org/viewvc?rev=1396087&view=rev
Log:
do launch pre tasks out of the thread
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1396087&r1=1396086&r2=1396087&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
Tue Oct 9 16:02:05 2012
@@ -430,10 +430,11 @@ public class AiravataClient implements A
private static int MAX_TIMEOUT=60000;
public String runWorkflow(final String topic, final NameValue[] inputs,
final String user,
final String metadata, final String experimentName,
final WorkflowContextHeaderBuilder builder, boolean launchOnThread) throws
Exception{
+ runPreWorkflowExecutionTasks(topic, user,
metadata,experimentName);
if (launchOnThread) {
new Thread(new Runnable() {
public void run() {
- launchWorkflow(topic, inputs, user,
metadata, experimentName, builder);
+ launchWorkflow(topic, inputs, builder);
}
}).start();
int timeout=0;
@@ -442,7 +443,7 @@ public class AiravataClient implements A
timeout+=MAX_TIMEOUT;
}
}else{
- launchWorkflow(topic, inputs, user, metadata,
experimentName, builder);
+ launchWorkflow(topic, inputs, builder);
}
return topic;
}
@@ -894,8 +895,6 @@ public class AiravataClient implements A
}
private void launchWorkflow(final String topic, final NameValue[]
inputs,
- final String user, final String metadata,
- final String experimentName,
final WorkflowContextHeaderBuilder builder) {
try {
WorkflowInterpretorStub stub = new
WorkflowInterpretorStub(
@@ -904,11 +903,8 @@ public class AiravataClient implements A
stub._getServiceClient().addHeader(
AXIOMUtil.stringToOM(XMLUtil
.xmlElementToString(builder.getXml())));
- runPreWorkflowExecutionTasks(topic, user,
metadata,experimentName);
stub.launchWorkflow(workflow, topic, inputs);
// log.info("Workflow output : " +
worflowoutput);
- } catch (RegistryException e) {
- // log.fine(e.getMessage(), e);
} catch (AxisFault e) {
e.printStackTrace();
} catch (XMLStreamException e) {
