root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2019-05-21 00:15:40 +02:00
parent 75d751d968
commit 8cd3daad0d
2 changed files with 7 additions and 6 deletions
Show Stats 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;
}

7
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
View File

@ -68,11 +68,12 @@ import org.springframework.web.util.WebUtils;
*/
public abstract class AbstractSockJsService implements SockJsService, CorsConfigurationSource {
private static final String XFRAME_OPTIONS_HEADER = "X-Frame-Options";
private static final long ONE_YEAR = TimeUnit.DAYS.toSeconds(365);
private static final Random random = new Random();
private static final String XFRAME_OPTIONS_HEADER = "X-Frame-Options";
private static final Random random = new Random();
protected final Log logger = LogFactory.getLog(getClass());
@ -291,7 +292,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
/**
* Return if automatic addition of CORS headers has been disabled.
* @since 4.1.2
* @see #setSuppressCors(boolean)
* @see #setSuppressCors
*/
public boolean shouldSuppressCors() {
return this.suppressCors;