Browse Source

Remove mentions of Tomcat async request timeout value

Close gh-24030
pull/24293/head
Rossen Stoyanchev 6 years ago
parent
commit
f4e0288357
  1. 4
      spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java
  2. 4
      spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java
  3. 4
      spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/AsyncSupportConfigurer.java
  4. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
  5. 2
      spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
  6. 2
      src/docs/asciidoc/web/webmvc.adoc

4
spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -53,7 +53,7 @@ public class MockAsyncContext implements AsyncContext { @@ -53,7 +53,7 @@ public class MockAsyncContext implements AsyncContext {
@Nullable
private String dispatchedPath;
private long timeout = 10 * 1000L; // 10 seconds is Tomcat's default
private long timeout = 10 * 1000L;
private final List<Runnable> dispatchHandlers = new ArrayList<>();

4
spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -53,7 +53,7 @@ public class MockAsyncContext implements AsyncContext { @@ -53,7 +53,7 @@ public class MockAsyncContext implements AsyncContext {
@Nullable
private String dispatchedPath;
private long timeout = 10 * 1000L; // 10 seconds is Tomcat's default
private long timeout = 10 * 1000L;
private final List<Runnable> dispatchHandlers = new ArrayList<>();

4
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/AsyncSupportConfigurer.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -71,7 +71,7 @@ public class AsyncSupportConfigurer { @@ -71,7 +71,7 @@ public class AsyncSupportConfigurer {
* processing thread has exited and ends when the request is dispatched again
* for further processing of the concurrently produced result.
* <p>If this value is not set, the default timeout of the underlying
* implementation is used, e.g. 10 seconds on Tomcat with Servlet 3.
* implementation is used.
* @param timeout the timeout value in milliseconds
*/
public AsyncSupportConfigurer setDefaultTimeout(long timeout) {

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java

@ -414,7 +414,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter @@ -414,7 +414,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
* processing thread has exited and ends when the request is dispatched again
* for further processing of the concurrently produced result.
* <p>If this value is not set, the default timeout of the underlying
* implementation is used, e.g. 10 seconds on Tomcat with Servlet 3.
* implementation is used.
* @param timeout the timeout value in milliseconds
*/
public void setAsyncRequestTimeout(long timeout) {

2
spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd

@ -253,7 +253,7 @@ @@ -253,7 +253,7 @@
Specify the amount of time, in milliseconds, before asynchronous request handling times out.
In Servlet 3, the timeout begins after the main request processing thread has exited and ends when the request
is dispatched again for further processing of the concurrently produced result. If this value is not set,
the default timeout of the underlying implementation is used, e.g. 10 seconds on Tomcat with Servlet 3.
the default timeout of the underlying implementation is used.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>

2
src/docs/asciidoc/web/webmvc.adoc

@ -4637,7 +4637,7 @@ The MVC configuration exposes the following options related to asynchronous requ @@ -4637,7 +4637,7 @@ The MVC configuration exposes the following options related to asynchronous requ
You can configure the following:
* Default timeout value for async requests, which if not set, depends
on the underlying Servlet container (for example, 10 seconds on Tomcat).
on the underlying Servlet container.
* `AsyncTaskExecutor` to use for blocking writes when streaming with
<<mvc-ann-async-reactive-types>> and for executing `Callable` instances returned from
controller methods. We highly recommended configuring this property if you

Loading…
Cancel
Save