fixed timeout assertion

master
Juergen Hoeller 13 years ago
parent 20f748865e
commit 36084c348f
  1. 4
      org.springframework.web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
  2. 4
      org.springframework.web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
  3. 4
      org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
  4. 4
      org.springframework.web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java

@ -96,7 +96,7 @@ public class CommonsClientHttpRequestFactory implements ClientHttpRequestFactory
* @see org.apache.commons.httpclient.params.HttpConnectionManagerParams#setConnectionTimeout(int) * @see org.apache.commons.httpclient.params.HttpConnectionManagerParams#setConnectionTimeout(int)
*/ */
public void setConnectTimeout(int timeout) { public void setConnectTimeout(int timeout) {
Assert.isTrue(timeout < 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
this.httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(timeout); this.httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(timeout);
} }
@ -107,7 +107,7 @@ public class CommonsClientHttpRequestFactory implements ClientHttpRequestFactory
* @see org.apache.commons.httpclient.params.HttpConnectionManagerParams#setSoTimeout(int) * @see org.apache.commons.httpclient.params.HttpConnectionManagerParams#setSoTimeout(int)
*/ */
public void setReadTimeout(int timeout) { public void setReadTimeout(int timeout) {
Assert.isTrue(timeout < 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
getHttpClient().getHttpConnectionManager().getParams().setSoTimeout(timeout); getHttpClient().getHttpConnectionManager().getParams().setSoTimeout(timeout);
} }

@ -112,7 +112,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
* @param timeout the timeout value in milliseconds * @param timeout the timeout value in milliseconds
*/ */
public void setConnectTimeout(int timeout) { public void setConnectTimeout(int timeout) {
Assert.isTrue(timeout < 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
getHttpClient().getParams().setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout); getHttpClient().getParams().setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout);
} }
@ -122,7 +122,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
* @param timeout the timeout value in milliseconds * @param timeout the timeout value in milliseconds
*/ */
public void setReadTimeout(int timeout) { public void setReadTimeout(int timeout) {
Assert.isTrue(timeout < 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
getHttpClient().getParams().setIntParameter(CoreConnectionPNames.SO_TIMEOUT, timeout); getHttpClient().getParams().setIntParameter(CoreConnectionPNames.SO_TIMEOUT, timeout);
} }

@ -102,7 +102,7 @@ public class CommonsHttpInvokerRequestExecutor extends AbstractHttpInvokerReques
* @see org.apache.commons.httpclient.params.HttpConnectionManagerParams#setConnectionTimeout(int) * @see org.apache.commons.httpclient.params.HttpConnectionManagerParams#setConnectionTimeout(int)
*/ */
public void setConnectTimeout(int timeout) { public void setConnectTimeout(int timeout) {
Assert.isTrue(timeout < 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
this.httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(timeout); this.httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(timeout);
} }
@ -114,7 +114,7 @@ public class CommonsHttpInvokerRequestExecutor extends AbstractHttpInvokerReques
* @see #DEFAULT_READ_TIMEOUT_MILLISECONDS * @see #DEFAULT_READ_TIMEOUT_MILLISECONDS
*/ */
public void setReadTimeout(int timeout) { public void setReadTimeout(int timeout) {
Assert.isTrue(timeout < 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
this.httpClient.getHttpConnectionManager().getParams().setSoTimeout(timeout); this.httpClient.getHttpConnectionManager().getParams().setSoTimeout(timeout);
} }

@ -113,7 +113,7 @@ public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvoke
* @param timeout the timeout value in milliseconds * @param timeout the timeout value in milliseconds
*/ */
public void setConnectTimeout(int timeout) { public void setConnectTimeout(int timeout) {
Assert.isTrue(timeout < 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
getHttpClient().getParams().setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout); getHttpClient().getParams().setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout);
} }
@ -124,7 +124,7 @@ public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvoke
* @see #DEFAULT_READ_TIMEOUT_MILLISECONDS * @see #DEFAULT_READ_TIMEOUT_MILLISECONDS
*/ */
public void setReadTimeout(int timeout) { public void setReadTimeout(int timeout) {
Assert.isTrue(timeout < 0, "Timeout must be a non-negative value"); Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
getHttpClient().getParams().setIntParameter(CoreConnectionPNames.SO_TIMEOUT, timeout); getHttpClient().getParams().setIntParameter(CoreConnectionPNames.SO_TIMEOUT, timeout);
} }

Loading…
Cancel
Save