Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2019-05-21 00:16:35 +02:00
parent 171e8f56a3 8cd3daad0d
commit c329bad42a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java
View File

@@ -100,9 +100,9 @@ public class DeferredResult<T> {
* @param timeoutValue timeout value in milliseconds (ignored if {@code null})
* @param timeoutResult the result to use
*/
public DeferredResult(@Nullable Long timeoutValue, final Object timeoutResult) {
this.timeoutResult = () -> timeoutResult;
public DeferredResult(@Nullable Long timeoutValue, Object timeoutResult) {
this.timeoutValue = timeoutValue;
this.timeoutResult = () -> timeoutResult;
}
/**
@@ -113,8 +113,8 @@ public class DeferredResult<T> {
* @since 5.1.1
*/
public DeferredResult(@Nullable Long timeoutValue, Supplier<?> timeoutResult) {
this.timeoutResult = timeoutResult;
this.timeoutValue = timeoutValue;
this.timeoutResult = timeoutResult;
}