Repository: airavata Updated Branches: refs/heads/master a04506128 -> 0665ee421
Get latest status if status has same update time Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0665ee42 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0665ee42 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0665ee42 Branch: refs/heads/master Commit: 0665ee421e1c348059684182b0c47486a2b050f4 Parents: a045061 Author: Shameera Rathnayaka <[email protected]> Authored: Fri Oct 2 16:24:21 2015 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Fri Oct 2 16:24:21 2015 -0400 ---------------------------------------------------------------------- .../core/experiment/catalog/resources/ExperimentResource.java | 5 +++-- .../registry/core/experiment/catalog/resources/JobResource.java | 5 +++-- .../core/experiment/catalog/resources/ProcessResource.java | 5 +++-- .../core/experiment/catalog/resources/TaskResource.java | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/0665ee42/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java index 7ccd652..e5355c7 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java @@ -572,8 +572,9 @@ public class ExperimentResource extends AbstractExpCatResource { ExperimentStatusResource max = experimentStatusResources.get(0); for(int i=1; i<experimentStatusResources.size();i++){ Timestamp timeOfStateChange = experimentStatusResources.get(i).getTimeOfStateChange(); - if (timeOfStateChange != null){ - if(timeOfStateChange.after(max.getTimeOfStateChange())){ + if (timeOfStateChange != null) { + if (timeOfStateChange.after(max.getTimeOfStateChange()) + || timeOfStateChange.equals(max.getTimeOfStateChange())) { max = experimentStatusResources.get(i); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/0665ee42/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 c438ab8..5c90455 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 @@ -371,8 +371,9 @@ public class JobResource extends AbstractExpCatResource { return null; }else{ JobStatusResource max = jobStatusResources.get(0); - for(int i=1; i<jobStatusResources.size();i++){ - if(jobStatusResources.get(i).getTimeOfStateChange().after(max.getTimeOfStateChange())){ + for(int i=1; i<jobStatusResources.size();i++) { + if (jobStatusResources.get(i).getTimeOfStateChange().after(max.getTimeOfStateChange()) + || jobStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange())) { max = jobStatusResources.get(i); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/0665ee42/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 5f79edf..57d3408 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 @@ -612,8 +612,9 @@ public class ProcessResource extends AbstractExpCatResource { ProcessStatusResource max = processStatusResources.get(0); for(int i=1; i<processStatusResources.size();i++){ Timestamp timeOfStateChange = processStatusResources.get(i).getTimeOfStateChange(); - if (timeOfStateChange != null){ - if(timeOfStateChange.after(max.getTimeOfStateChange())){ + if (timeOfStateChange != null) { + if (timeOfStateChange.after(max.getTimeOfStateChange()) + || timeOfStateChange.equals(max.getTimeOfStateChange())) { max = processStatusResources.get(i); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/0665ee42/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 bd6ff74..926f4ba 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 @@ -363,8 +363,9 @@ public class TaskResource extends AbstractExpCatResource { return null; }else{ TaskStatusResource max = taskStatusResources.get(0); - for(int i=1; i<taskStatusResources.size();i++){ - if(taskStatusResources.get(i).getTimeOfStateChange().after(max.getTimeOfStateChange())){ + for(int i=1; i<taskStatusResources.size();i++) { + if (taskStatusResources.get(i).getTimeOfStateChange().after(max.getTimeOfStateChange()) + || taskStatusResources.get(i).getTimeOfStateChange().equals(max.getTimeOfStateChange())) { max = taskStatusResources.get(i); } }
