From: Bryan Duxbury <bryanduxbury@apache.org>
Date: Thu, 29 Apr 2010 17:08:17 +0000 (+0000)
Subject: THRIFT-766. java: Propagate TSocket timeout to connect
X-Git-Tag: 0.3.0~25
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=332a625118c87d1ea3540aefff3f5ad8ddf8428b;p=common%2Fthrift.git

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 75ceddc6..606e8a90 100644
--- 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) {