[airavata] branch develop updated: AIRAVATA-2980 Also set experiment id for added experiment

[machristie]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 99439ed  AIRAVATA-2980 Also set experiment id for added experiment
99439ed is described below

commit 99439ed729c0f95355f1e0fc88bc5f2162261e14
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Mon Feb 18 15:39:09 2019 -0500

    AIRAVATA-2980 Also set experiment id for added experiment
---
 .../registry/core/repositories/expcatalog/ExperimentRepository.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
index b89506d..a59056c 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
@@ -54,10 +54,6 @@ public class ExperimentRepository extends 
ExpCatAbstractRepository<ExperimentMod
     }
 
     protected ExperimentEntity saveExperiment(ExperimentModel experimentModel) 
throws RegistryException {
-        if (experimentModel.getExperimentId() == null || 
experimentModel.getExperimentId().equals(airavata_commonsConstants.DEFAULT_ID)) 
{
-            logger.debug("Setting the Experiment's ExperimentId");
-            
experimentModel.setExperimentId(AiravataUtils.getId(experimentModel.getExperimentName()));
-        }
         String experimentId = experimentModel.getExperimentId();
 
         if (experimentModel.getExperimentStatus() != null) {
@@ -117,6 +113,7 @@ public class ExperimentRepository extends 
ExpCatAbstractRepository<ExperimentMod
         experimentStatus.setState(ExperimentState.CREATED);
         
experimentStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
         experimentModel.addToExperimentStatus(experimentStatus);
+        
experimentModel.setExperimentId(AiravataUtils.getId(experimentModel.getExperimentName()));
 
         return saveExperimentModelData(experimentModel);
     }