Repository: airavata Updated Branches: refs/heads/master 2dde0d3aa -> 8a7913fad
Fixeded Airavata-1661. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1742c492 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1742c492 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1742c492 Branch: refs/heads/master Commit: 1742c4929662c2e26e3d04383b073023b5dae06d Parents: 73c8337 Author: raminder <[email protected]> Authored: Wed Apr 15 12:42:59 2015 -0400 Committer: raminder <[email protected]> Committed: Wed Apr 15 12:42:59 2015 -0400 ---------------------------------------------------------------------- .../airavata/gfac/core/monitor/AiravataJobStatusUpdator.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/1742c492/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java index c08ea51..0af8df0 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java @@ -90,9 +90,11 @@ public class AiravataJobStatusUpdator implements AbstractActivityListener { details = new JobDetails(); } org.apache.airavata.model.workspace.experiment.JobStatus status = new org.apache.airavata.model.workspace.experiment.JobStatus(); - if(!JobState.CANCELED.equals(details.getJobStatus().getJobState())&& - !JobState.CANCELING.equals(details.getJobStatus().getJobState())) { - status.setJobState(state); + if(JobState.CANCELED.equals(details.getJobStatus().getJobState())|| + JobState.CANCELING.equals(details.getJobStatus().getJobState())) { + status.setJobState(details.getJobStatus().getJobState()); + }else{ + status.setJobState(state); } status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis()); details.setJobStatus(status);
