geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject [geode] branch develop updated: GEODE-4768: Close the socket to the locator in the experimental driver
Date Tue, 13 Mar 2018 21:31:22 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/develop by this push:
     new 2f1fe57  GEODE-4768: Close the socket to the locator in the experimental driver
2f1fe57 is described below

commit 2f1fe57108adaeed4dfb55fbcc2e813422cfea3d
Author: Dan Smith <upthewaterspout@apache.org>
AuthorDate: Wed Mar 7 17:01:13 2018 -0800

    GEODE-4768: Close the socket to the locator in the experimental driver
---
 .../org/apache/geode/experimental/driver/ProtobufChannel.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufChannel.java
b/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufChannel.java
index 5d674f9..b07d910 100644
--- a/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufChannel.java
+++ b/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufChannel.java
@@ -92,8 +92,9 @@ class ProtobufChannel {
     IOException lastException = null;
 
     for (InetSocketAddress locator : locators) {
+      Socket locatorSocket = null;
       try {
-        final Socket locatorSocket = new Socket(locator.getAddress(), locator.getPort());
+        locatorSocket = new Socket(locator.getAddress(), locator.getPort());
 
         final OutputStream outputStream = locatorSocket.getOutputStream();
         final InputStream inputStream = locatorSocket.getInputStream();
@@ -127,6 +128,11 @@ class ProtobufChannel {
         return new InetSocketAddress(server.getHostname(), server.getPort());
       } catch (IOException e) {
         lastException = e;
+      } finally {
+        if (locatorSocket != null) {
+          locatorSocket.setSoLinger(true, 0);
+          locatorSocket.close();
+        }
       }
     }
 

-- 
To stop receiving notification emails like this one, please contact
upthewaterspout@apache.org.

Mime
View raw message