Removed mislead experiment launched status update and replace it with completed state
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3b330c0d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3b330c0d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3b330c0d Branch: refs/heads/master Commit: 3b330c0d39e6bf156550a7293bb9fe051344ed6b Parents: 6e0ea93 Author: shamrath <[email protected]> Authored: Tue Oct 28 14:12:36 2014 -0400 Committer: shamrath <[email protected]> Committed: Tue Oct 28 14:12:36 2014 -0400 ---------------------------------------------------------------------- .../api/server/listener/AiravataExperimentStatusUpdator.java | 2 +- .../airavata/workflow/engine/interpretor/WorkflowInterpreter.java | 2 +- .../src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/3b330c0d/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java index 91c2efe..05f5ddb 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java @@ -66,7 +66,7 @@ public class AiravataExperimentStatusUpdator implements AbstractActivityListener state = ExperimentState.CANCELED; updateExperimentStatus = true; break; case COMPLETED: - state = ExperimentState.COMPLETED; updateExperimentStatus = false; + state = ExperimentState.EXECUTING; updateExperimentStatus = false; break; case INVOKED: state = ExperimentState.LAUNCHED; updateExperimentStatus = false; http://git-wip-us.apache.org/repos/asf/airavata/blob/3b330c0d/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java index 906b954..59681c7 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java @@ -407,7 +407,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{ } finally{ cleanup(); this.getWorkflow().setExecutionState(WorkflowExecutionState.NONE); - ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent(ExperimentState.LAUNCHED, experiment.getExperimentID(), gatewayId); + ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent(ExperimentState.COMPLETED, experiment.getExperimentID(), gatewayId); MessageContext msgCtx = new MessageContext(event, MessageType.EXPERIMENT, AiravataUtils.getId("EXPERIMENT"), gatewayId); msgCtx.setUpdatedTime(new Timestamp(Calendar.getInstance().getTimeInMillis())); publisher.publish(msgCtx); http://git-wip-us.apache.org/repos/asf/airavata/blob/3b330c0d/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java index 87ce29c..57fd217 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java @@ -207,7 +207,7 @@ public class Monitor extends EventProducer { for (String key : keys) { eventDataMap.get(key).addEvent(eventData); } - if (eventData.getType() == MessageType.EXPERIMENT && eventData.getStatus().equals(ExperimentState.LAUNCHED.toString())) { + if (eventData.getType() == MessageType.EXPERIMENT && eventData.getStatus().equals(ExperimentState.COMPLETED.toString())) { unsubscribe(eventData.getExperimentId()); } }
