Repository: airavata Updated Branches: refs/heads/master 01414757c -> e6d66d000
Fix Experiment never goes to Cancelled state. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8c857787 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8c857787 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8c857787 Branch: refs/heads/master Commit: 8c85778739b3ac0cefe36709494720bd5542e6fd Parents: 2bf83dd Author: shamrath <[email protected]> Authored: Wed May 13 17:31:59 2015 -0400 Committer: shamrath <[email protected]> Committed: Wed May 13 17:31:59 2015 -0400 ---------------------------------------------------------------------- .../api/server/listener/AiravataExperimentStatusUpdator.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/8c857787/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 70a3f94..934d4e5 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 @@ -169,12 +169,7 @@ public class AiravataExperimentStatusUpdator implements AbstractActivityListener org.apache.airavata.model.workspace.experiment.ExperimentStatus status = new org.apache.airavata.model.workspace.experiment.ExperimentStatus(); status.setExperimentState(state); status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis()); - if(!ExperimentState.CANCELED.equals(details.getExperimentStatus().getExperimentState())&& - !ExperimentState.CANCELING.equals(details.getExperimentStatus().getExperimentState())) { - status.setExperimentState(state); - }else{ - status.setExperimentState(details.getExperimentStatus().getExperimentState()); - } + status.setExperimentState(state); details.setExperimentStatus(status); logger.info("Updating the experiment status of experiment: " + experimentId + " to " + status.getExperimentState().toString()); airavataRegistry.update(RegistryModelType.EXPERIMENT_STATUS, status, experimentId);
