You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/01/10 15:39:45 UTC

[airavata] branch develop updated: AIRAVATA-3186 Return cred store clients to pool

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 8f653a6  AIRAVATA-3186 Return cred store clients to pool
     new e61712e  Merge branch 'AIRAVATA-3186-csclientpool' into develop
8f653a6 is described below

commit 8f653a6d53861efddb70f4a950d54e6729beeeab
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jan 7 12:39:03 2020 -0500

    AIRAVATA-3186 Return cred store clients to pool
---
 .../org/apache/airavata/api/server/handler/AiravataServerHandler.java   | 2 ++
 1 file changed, 2 insertions(+)

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 fdbf8da..c4de86f 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
@@ -4494,6 +4494,7 @@ public class AiravataServerHandler implements Airavata.Iface {
         SSHCredential sshCredential = null;
         try {
             sshCredential = csClient.getSSHCredential(airavataCredStoreToken, gatewayId);
+            csClientPool.returnResource(csClient);
         }catch (Exception e){
             logger.error("Error occurred while retrieving SSH Credential", e);
             AiravataSystemException exception = new AiravataSystemException();
@@ -4523,6 +4524,7 @@ public class AiravataServerHandler implements Airavata.Iface {
         SSHCredential sshCredential = null;
         try {
             sshCredential = csClient.getSSHCredential(airavataCredStoreToken, gatewayId);
+            csClientPool.returnResource(csClient);
         }catch (Exception e){
             logger.error("Error occurred while retrieving SSH Credential", e);
             AiravataSystemException exception = new AiravataSystemException();