svn commit: r939380 - /incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java

[bryanduxbury]

Author: bryanduxbury
Date: Thu Apr 29 17:08:17 2010
New Revision: 939380

URL: http://svn.apache.org/viewvc?rev=939380&view=rev
Log:
THRIFT-766. java: Propagate TSocket timeout to connect

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

Patch: David Helder

Modified:
    incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java

Modified: 
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java?rev=939380&r1=939379&r2=939380&view=diff
==============================================================================
--- 
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java 
(original)
+++ 
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSocket.java 
Thu Apr 29 17:08:17 2010
@@ -177,7 +177,7 @@ public class TSocket extends TIOStreamTr
     }
 
     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) {