airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [1/2] airavata git commit: rolling back reusing sharing client
Date Wed, 15 Feb 2017 15:29:19 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop cfb0610fb -> 3072a7369


rolling back reusing sharing client


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a7d53100
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a7d53100
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a7d53100

Branch: refs/heads/develop
Commit: a7d5310073afac8ef7ef36060add3dafd16f8501
Parents: 0926abf
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Wed Feb 15 10:28:03 2017 -0500
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Wed Feb 15 10:28:03 2017 -0500

----------------------------------------------------------------------
 .../api/server/handler/AiravataServerHandler.java         | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/a7d53100/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
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 1fdcca4..d4479b3 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
@@ -92,8 +92,6 @@ public class AiravataServerHandler implements Airavata.Iface {
     private Publisher experimentPublisher;
     private CredentialStoreService.Client csClient;
 
-    private SharingRegistryService.Client sharingClient;
-
     public AiravataServerHandler() {
         try {
             statusPublisher = MessagingFactory.getPublisher(Type.STATUS);
@@ -4117,13 +4115,7 @@ public class AiravataServerHandler implements Airavata.Iface {
         final int serverPort = Integer.parseInt(ServerSettings.getSharingRegistryPort());
         final String serverHost = ServerSettings.getSharingRegistryHost();
         try {
-            if (sharingClient != null && sharingClient.getInputProtocol().getTransport().isOpen()
&&
-                    sharingClient.getOutputProtocol().getTransport().isOpen()) {
-                return sharingClient;
-            } else {
-                sharingClient = SharingRegistryServiceClientFactory.createSharingRegistryClient(serverHost,
serverPort);
-                return sharingClient;
-            }
+            return SharingRegistryServiceClientFactory.createSharingRegistryClient(serverHost,
serverPort);
         } catch (SharingRegistryException e) {
             throw new TException("Unable to create sharing registry client...", e);
         }


Mime
View raw message