summaryrefslogtreecommitdiff
path: root/gnu/java/net/protocol/http/HTTPConnection.java
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2006-05-20 22:55:00 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2006-05-20 22:55:00 +0000
commit5418bfcd1dcd18878b4d0910610513c6247632ec (patch)
treec7e274af46c60dab1174c0b7dc6aedf45a5df6f6 /gnu/java/net/protocol/http/HTTPConnection.java
parent7eab2896e4bc891612450c50a41d99e1804fc940 (diff)
downloadclasspath-5418bfcd1dcd18878b4d0910610513c6247632ec.tar.gz
2006-05-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD to generics for 0.91 to 2006/05/20.
Diffstat (limited to 'gnu/java/net/protocol/http/HTTPConnection.java')
-rw-r--r--gnu/java/net/protocol/http/HTTPConnection.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/java/net/protocol/http/HTTPConnection.java b/gnu/java/net/protocol/http/HTTPConnection.java
index 33d9756aa..f5e831c6a 100644
--- a/gnu/java/net/protocol/http/HTTPConnection.java
+++ b/gnu/java/net/protocol/http/HTTPConnection.java
@@ -466,7 +466,8 @@ public class HTTPConnection
*/
synchronized HTTPConnection get(String host,
int port,
- boolean secure)
+ boolean secure,
+ int connectionTimeout, int timeout)
{
String ttl =
SystemProperties.getProperty("classpath.net.http.keepAliveTTL");
@@ -494,7 +495,7 @@ public class HTTPConnection
}
if (c == null)
{
- c = new HTTPConnection(host, port, secure);
+ c = new HTTPConnection(host, port, secure, connectionTimeout, timeout);
c.setPool(this);
}
return c;