You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/08/02 20:12:49 UTC
airavata git commit: fixing gatewayId not set for
ExperimentSummaryModel
Repository: airavata
Updated Branches:
refs/heads/master 50e04f135 -> 053bb9f22
fixing gatewayId not set for ExperimentSummaryModel
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/053bb9f2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/053bb9f2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/053bb9f2
Branch: refs/heads/master
Commit: 053bb9f223b60e4cedcb5cca49e61811dda758d7
Parents: 50e04f1
Author: Supun Nakandala <sc...@apache.org>
Authored: Sun Aug 2 23:41:18 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Sun Aug 2 23:41:18 2015 +0530
----------------------------------------------------------------------
.../registry/core/experiment/catalog/resources/Utils.java | 2 +-
.../core/experiment/catalog/utils/ThriftDataModelConversion.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/053bb9f2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
index 14d5424..d7def01 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
@@ -397,7 +397,7 @@ public class Utils {
experimentSummaryResource.setExperimentId(o.getExperimentId());
experimentSummaryResource.setProjectId(o.getProjectId());
experimentSummaryResource.setUserName(o.getUserName());
- experimentSummaryResource.setUserName(o.getUserName());
+ experimentSummaryResource.setGatewayId(o.getGatewayId());
experimentSummaryResource.setExecutionId(o.getExecutionId());
experimentSummaryResource.setExperimentName(o.getExperimentName());
experimentSummaryResource.setCreationTime(o.getCreationTime());
http://git-wip-us.apache.org/repos/asf/airavata/blob/053bb9f2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index ec9e287..e7ebad1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -101,9 +101,7 @@ public class ThriftDataModelConversion {
experimentSummary.setUserName(experimentSummaryResource.getUserName());
experimentSummary.setName(experimentSummaryResource.getExperimentName());
experimentSummary.setDescription(experimentSummaryResource.getDescription());
- ExperimentState experimentState = ExperimentState.valueOf(experimentSummaryResource.getState());
-// FIXME : Experiment Summary resource is incomplete at this point
-// experimentSummary.setExperimentStatus(experimentSummaryResource.getState());
+ experimentSummary.setExperimentStatus(experimentSummaryResource.getState());
return experimentSummary;
}
return null;