Repository: airavata Updated Branches: refs/heads/develop 92cc0dfea -> dceabc83e
fixing error status retrieving Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6d099155 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6d099155 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6d099155 Branch: refs/heads/develop Commit: 6d0991553008b8f00e5d96e09f1af3710ee12a0b Parents: 2d8e350 Author: Chathuri Wimalasena <[email protected]> Authored: Wed Dec 23 11:30:33 2015 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Wed Dec 23 11:30:33 2015 -0500 ---------------------------------------------------------------------- .../registry/core/experiment/catalog/resources/JobResource.java | 4 +++- .../core/experiment/catalog/resources/ProcessResource.java | 4 +++- .../registry/core/experiment/catalog/resources/TaskResource.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6d099155/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java index 01658b8..1cf84fb 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java @@ -374,7 +374,9 @@ public class JobResource extends AbstractExpCatResource { JobStatusResource max = jobStatusResources.get(0); for(int i=1; i<jobStatusResources.size();i++) { if (jobStatusResources.get(i).getTimeOfStateChange().after(max.getTimeOfStateChange()) - || (jobStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange()) && jobStatusResources.get(i).getState().equals(JobState.COMPLETE.toString()))) { + || (jobStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange()) && jobStatusResources.get(i).getState().equals(JobState.COMPLETE.toString())) + || (jobStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange()) && jobStatusResources.get(i).getState().equals(JobState.FAILED.toString())) + || (jobStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange()) && jobStatusResources.get(i).getState().equals(JobState.CANCELED.toString()))) { max = jobStatusResources.get(i); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/6d099155/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java index aed389f..2934552 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java @@ -645,7 +645,9 @@ public class ProcessResource extends AbstractExpCatResource { Timestamp timeOfStateChange = processStatusResources.get(i).getTimeOfStateChange(); if (timeOfStateChange != null) { if (timeOfStateChange.after(max.getTimeOfStateChange()) - || (timeOfStateChange.equals(max.getTimeOfStateChange()) && processStatusResources.get(i).getState().equals(ProcessState.COMPLETED.toString()))) { + || (timeOfStateChange.equals(max.getTimeOfStateChange()) && processStatusResources.get(i).getState().equals(ProcessState.COMPLETED.toString())) + || (timeOfStateChange.equals(max.getTimeOfStateChange()) && processStatusResources.get(i).getState().equals(ProcessState.FAILED.toString())) + || (timeOfStateChange.equals(max.getTimeOfStateChange()) && processStatusResources.get(i).getState().equals(ProcessState.CANCELED.toString()))) { max = processStatusResources.get(i); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/6d099155/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java index 5b70763..7ea2821 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java @@ -405,7 +405,9 @@ public class TaskResource extends AbstractExpCatResource { TaskStatusResource max = taskStatusResources.get(0); for(int i=1; i<taskStatusResources.size();i++) { if (taskStatusResources.get(i).getTimeOfStateChange().after(max.getTimeOfStateChange()) - || (taskStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange()) && taskStatusResources.get(i).getState().equals(TaskState.COMPLETED.toString()) )) { + || (taskStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange()) && taskStatusResources.get(i).getState().equals(TaskState.COMPLETED.toString())) + || (taskStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange()) && taskStatusResources.get(i).getState().equals(TaskState.FAILED.toString())) + || (taskStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange()) && taskStatusResources.get(i).getState().equals(TaskState.CANCELED.toString()))) { max = taskStatusResources.get(i); } }
