From: Jake Farrell <jfarrell@apache.org>
Date: Fri, 2 Mar 2012 05:22:02 +0000 (+0000)
Subject: THRIFT-1523: clientTimeout not worked as expected in TServerSocket created by TSSLTra... 
X-Git-Tag: 0.9.1~429
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=4ca8c3b8197994b9933a33556144a3403d09f75e;p=common%2Fthrift.git

THRIFT-1523: clientTimeout not worked as expected in TServerSocket created by TSSLTransportFactory
Client: java
Patch: Alexey Sviridov

Adds server timeout to SSLTransportFactory



git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1296053 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java b/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
index f5611aab..25df97f1 100644
--- a/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
+++ b/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
@@ -112,7 +112,7 @@ public class TSSLTransportFactory {
       if (params != null && params.cipherSuites != null) {
         serverSocket.setEnabledCipherSuites(params.cipherSuites);
       }
-      return new TServerSocket(serverSocket);
+      return new TServerSocket(serverSocket, timeout);
     } catch (Exception e) {
       throw new TTransportException("Could not bind to port " + port, e);
     }