[airavata] branch staging updated: Getting the last experiment status from registry

[dimuthuupe]

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

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


The following commit(s) were added to refs/heads/staging by this push:
     new 2ace663  Getting the last experiment status from registry
2ace663 is described below

commit 2ace6638a6a6f5a5e846e9d1d2aa551f3c00800b
Author: Dimuthu Wannipurage <dimuthu.upeks...@gmail.com>
AuthorDate: Sat Jul 20 01:11:57 2019 -0400

    Getting the last experiment status from registry
---
 .../org/apache/airavata/api/server/handler/AiravataServerHandler.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
 
b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 5c322ee..ca9b95e 100644
--- 
a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ 
b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -2205,11 +2205,12 @@ public class AiravataServerHandler implements 
Airavata.Iface {
         RegistryService.Client regClient = registryClientPool.getResource();
         try {
             ExperimentModel existingExperiment = 
regClient.getExperiment(airavataExperimentId);
+            ExperimentStatus experimentLastStatus = 
regClient.getExperimentStatus(airavataExperimentId);
             if (existingExperiment == null){
                 logger.error(airavataExperimentId, "Error while cancelling 
experiment {}, experiment doesn't exist.", airavataExperimentId);
                 throw new ExperimentNotFoundException("Requested experiment id 
" + airavataExperimentId + " does not exist in the system..");
             }
-            switch 
(existingExperiment.getExperimentStatus().get(0).getState()) {
+            switch (experimentLastStatus.getState()) {
                 case COMPLETED: case CANCELED: case FAILED: case CANCELING:
                     logger.warn("Can't terminate already {} experiment", 
existingExperiment.getExperimentStatus().get(0).getState().name());
                     break;