Browse Source

Polishing

pull/25598/head
Juergen Hoeller 7 years ago
parent
commit
c2b8c592ee
  1. 2
      spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java
  2. 2
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java

2
spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java

@ -100,8 +100,8 @@ public class DeferredResult<T> { @@ -100,8 +100,8 @@ public class DeferredResult<T> {
* @param timeoutResult the result to use
*/
public DeferredResult(@Nullable Long timeoutValue, Object timeoutResult) {
this.timeoutResult = timeoutResult;
this.timeoutValue = timeoutValue;
this.timeoutResult = timeoutResult;
}

2
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java

@ -288,7 +288,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig @@ -288,7 +288,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;

Loading…
Cancel
Save