Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch 8f4ae8b33 -> 321f477ce
adding cancelling state to Cancelled state in experiment statistics Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/321f477c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/321f477c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/321f477c Branch: refs/heads/airavata-0.15-release-branch Commit: 321f477ce4522ba6738a0facc8da260f91d8c6f8 Parents: 8f4ae8b Author: Supun Nakandala <[email protected]> Authored: Sat Jul 18 15:21:04 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Sat Jul 18 15:21:04 2015 +0530 ---------------------------------------------------------------------- .../airavata/persistance/registry/jpa/resources/WorkerResource.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/321f477c/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java index 264b15d..7673750 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java @@ -747,6 +747,7 @@ public class WorkerResource extends AbstractResource { experimentStatisticsResource.setFailedExperiments(failedExperiments); List<ExperimentSummaryResource> cancelledExperiments = getExperimentStatisticsForState(ExperimentState.CANCELED, gatewayId, fromTime, toTime); + cancelledExperiments.addAll(getExperimentStatisticsForState(ExperimentState.CANCELING, gatewayId, fromTime, toTime)); experimentStatisticsResource.setCancelledExperimentCount(cancelledExperiments.size()); experimentStatisticsResource.setCancelledExperiments(cancelledExperiments);
