(airavata) branch cybershuttle-staging updated: Allow terminated & stopped sessions from being blocked

[dimuthuupe]

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

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


The following commit(s) were added to refs/heads/cybershuttle-staging by this 
push:
     new 2d101eda26 Allow terminated & stopped sessions from being blocked
2d101eda26 is described below

commit 2d101eda2684e5091baa0c8bef1b4d243ee3b711
Author: ganning127 <gannin...@gmail.com>
AuthorDate: Thu Apr 10 23:48:46 2025 -0400

    Allow terminated & stopped sessions from being blocked
---
 .../airavata/research/service/handlers/SessionHandler.java  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git 
a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/SessionHandler.java
 
b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/SessionHandler.java
index 75bf7ae3fe..c475d2fe1b 100644
--- 
a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/SessionHandler.java
+++ 
b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/SessionHandler.java
@@ -80,7 +80,11 @@ public class SessionHandler {
         }
 
         if (status == SessionStatusEnum.TERMINATED) {
-            researchHubHandler.stopSession(sessionId);
+            try {
+                researchHubHandler.stopSession(sessionId);
+            } catch(Exception e) {
+                LOGGER.warn("Unable to stop session");
+            }
         }
 
         session.setStatus(status);
@@ -99,7 +103,12 @@ public class SessionHandler {
             throw new RuntimeException("Invalid session ID");
         }
 
-        researchHubHandler.deleteSession(sessionId);
+        try {
+            researchHubHandler.deleteSession(sessionId);
+        } catch(Exception e) {
+            LOGGER.warn("Unable to delete session, user already deleted it");
+        }
+
         sessionRepository.delete(session);
         return true;
     }