THRIFT-766. java: Propagate TSocket timeout to connect

This patch makes sure the specified timeout is used when opening connections, too.

Patch: David Helder

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

diff --git a/lib/java/src/org/apache/thrift/transport/TSocket.java b/lib/java/src/org/apache/thrift/transport/TSocket.java
index 75ceddc..606e8a9 100644 (file)
--- a/lib/java/src/org/apache/thrift/transport/TSocket.java
+++ b/lib/java/src/org/apache/thrift/transport/TSocket.java
@@ -177,7 +177,7 @@ public class TSocket extends TIOStreamTransport {
     }
 
     try {
-      socket_.connect(new InetSocketAddress(host_, port_));
+      socket_.connect(new InetSocketAddress(host_, port_), timeout_);
       inputStream_ = new BufferedInputStream(socket_.getInputStream(), 1024);
       outputStream_ = new BufferedOutputStream(socket_.getOutputStream(), 1024);
     } catch (IOException iox) {