You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ro...@apache.org on 2007/02/21 19:12:27 UTC
svn commit: r510131 - in /jakarta/httpcomponents/httpclient/trunk/src:
java/org/apache/http/impl/conn/ test/org/apache/http/mockup/
Author: rolandw
Date: Wed Feb 21 10:12:26 2007
New Revision: 510131
URL: http://svn.apache.org/viewvc?view=rev&rev=510131
Log:
updated to new timeout methods in HttpConnection
Modified:
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/AbstractClientConnectionAdapter.java
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/mockup/HttpConnectionMockup.java
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/AbstractClientConnectionAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/AbstractClientConnectionAdapter.java?view=diff&rev=510131&r1=510130&r2=510131
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/AbstractClientConnectionAdapter.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/AbstractClientConnectionAdapter.java Wed Feb 21 10:12:26 2007
@@ -133,6 +133,20 @@
}
+ // non-javadoc, see interface HttpConnection
+ public void setSocketTimeout(int timeout) {
+ assertWrappedConn();
+ wrappedConnection.setSocketTimeout(timeout);
+ }
+
+
+ // non-javadoc, see interface HttpConnection
+ public int getSocketTimeout() {
+ assertWrappedConn();
+ return wrappedConnection.getSocketTimeout();
+ }
+
+
// non-javadoc, see interface HttpClientConnection
public void flush()
throws IOException {
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java?view=diff&rev=510131&r1=510130&r2=510131
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java Wed Feb 21 10:12:26 2007
@@ -1408,20 +1408,6 @@
}
}
-
-/*
- //===========================
- // HttpHostConnection methods
- //===========================
-
- public void setSocketTimeout(int timeout) throws SocketException {
- if (hasConnection()) {
- wrappedConnection.setSocketTimeout(timeout);
- } else {
- // do nothing
- }
- }
-*/
} // class HttpConnectionAdapter
} // class ThreadSafeClientConnManager
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/mockup/HttpConnectionMockup.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/mockup/HttpConnectionMockup.java?view=diff&rev=510131&r1=510130&r2=510131
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/mockup/HttpConnectionMockup.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/mockup/HttpConnectionMockup.java Wed Feb 21 10:12:26 2007
@@ -55,7 +55,7 @@
this.open = false;
}
- public int getSocketTimeout() throws IOException {
+ public int getSocketTimeout() {
return 0;
}
@@ -67,6 +67,6 @@
return false;
}
- public void setSocketTimeout(int timeout) throws IOException {
+ public void setSocketTimeout(int timeout) {
}
}