summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Duxbury <bryanduxbury@apache.org>2010-04-29 17:08:17 +0000
committerBryan Duxbury <bryanduxbury@apache.org>2010-04-29 17:08:17 +0000
commit332a625118c87d1ea3540aefff3f5ad8ddf8428b (patch)
tree69453ce26776227d1515083b0ef313a9bc9f74f8
parentabfc54fa0689f8257a1612df39f1f25d3fe0c560 (diff)
downloadthrift-332a625118c87d1ea3540aefff3f5ad8ddf8428b.tar.gz
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
-rw-r--r--lib/java/src/org/apache/thrift/transport/TSocket.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/java/src/org/apache/thrift/transport/TSocket.java b/lib/java/src/org/apache/thrift/transport/TSocket.java
index 75ceddc6e..606e8a90f 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) {