You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2011/08/12 12:35:33 UTC
svn commit: r1157038 [2/2] - in /httpcomponents/httpcore/trunk:
httpcore-nio/src/examples/org/apache/http/examples/nio/
httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/
httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ httpcore-nio/...
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java?rev=1157038&r1=1157037&r2=1157038&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java Fri Aug 12 10:35:32 2011
@@ -50,7 +50,7 @@ public class HttpClientNio {
public HttpClientNio(final HttpParams params) throws IOException {
super();
- this.ioReactor = new DefaultConnectingIOReactor(2, params);
+ this.ioReactor = new DefaultConnectingIOReactor();
this.params = params;
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLClient.java?rev=1157038&r1=1157037&r2=1157038&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLClient.java Fri Aug 12 10:35:32 2011
@@ -60,7 +60,7 @@ public class HttpSSLClient {
super();
this.params = params;
this.sslcontext = createSSLContext();
- this.ioReactor = new DefaultConnectingIOReactor(2, this.params);
+ this.ioReactor = new DefaultConnectingIOReactor();
}
private TrustManagerFactory createTrustManagerFactory() throws NoSuchAlgorithmException {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java?rev=1157038&r1=1157037&r2=1157038&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java Fri Aug 12 10:35:32 2011
@@ -65,7 +65,7 @@ public class HttpSSLServer {
super();
this.params = params;
this.sslcontext = createSSLContext();
- this.ioReactor = new DefaultListeningIOReactor(2, this.params);
+ this.ioReactor = new DefaultListeningIOReactor();
}
private KeyManagerFactory createKeyManagerFactory() throws NoSuchAlgorithmException {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpServerNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpServerNio.java?rev=1157038&r1=1157037&r2=1157038&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpServerNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpServerNio.java Fri Aug 12 10:35:32 2011
@@ -55,7 +55,7 @@ public class HttpServerNio {
public HttpServerNio(final HttpParams params) throws IOException {
super();
- this.ioReactor = new DefaultListeningIOReactor(2, params);
+ this.ioReactor = new DefaultListeningIOReactor();
this.params = params;
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java?rev=1157038&r1=1157037&r2=1157038&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java Fri Aug 12 10:35:32 2011
@@ -78,11 +78,11 @@ public class BasicConnPool extends Abstr
if (socket == null) {
throw new IOException(scheme + " scheme is not supported");
}
- int connTimeout = HttpConnectionParams.getConnectionTimeout(params);
- int soTimeout = HttpConnectionParams.getSoTimeout(params);
+ int connectTimeout = HttpConnectionParams.getConnectionTimeout(this.params);
+ int soTimeout = HttpConnectionParams.getSoTimeout(this.params);
socket.setSoTimeout(soTimeout);
- socket.connect(new InetSocketAddress(host.getHostName(), host.getPort()), connTimeout);
+ socket.connect(new InetSocketAddress(host.getHostName(), host.getPort()), connectTimeout);
conn.bind(socket, this.params);
return conn;
}