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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2017-09-27 01:34:11 +02:00
parent a4b2ae583e
commit efce7902c4
43 changed files with 107 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java
View File

@@ -110,8 +110,7 @@ public class WebMvcStompWebSocketEndpointRegistration implements StompWebSocketE
this.registration.setTransportHandlerOverrides(handler);
}
if (!this.allowedOrigins.isEmpty()) {
this.registration.setAllowedOrigins(
this.allowedOrigins.toArray(new String[this.allowedOrigins.size()]));
this.registration.setAllowedOrigins(this.allowedOrigins.toArray(new String[this.allowedOrigins.size()]));
}
return this.registration;
}

8
spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServletServerContainerFactoryBean.java
View File

@@ -66,7 +66,7 @@ public class ServletServerContainerFactoryBean
private ServerContainer serverContainer;
public void setAsyncSendTimeout(long timeoutInMillis) {
public void setAsyncSendTimeout(Long timeoutInMillis) {
this.asyncSendTimeout = timeoutInMillis;
}
@@ -75,7 +75,7 @@ public class ServletServerContainerFactoryBean
return this.asyncSendTimeout;
}
public void setMaxSessionIdleTimeout(long timeoutInMillis) {
public void setMaxSessionIdleTimeout(Long timeoutInMillis) {
this.maxSessionIdleTimeout = timeoutInMillis;
}
@@ -84,7 +84,7 @@ public class ServletServerContainerFactoryBean
return this.maxSessionIdleTimeout;
}
public void setMaxTextMessageBufferSize(int bufferSize) {
public void setMaxTextMessageBufferSize(Integer bufferSize) {
this.maxTextMessageBufferSize = bufferSize;
}
@@ -93,7 +93,7 @@ public class ServletServerContainerFactoryBean
return this.maxTextMessageBufferSize;
}
public void setMaxBinaryMessageBufferSize(int bufferSize) {
public void setMaxBinaryMessageBufferSize(Integer bufferSize) {
this.maxBinaryMessageBufferSize = bufferSize;
}

4
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java
View File

@@ -226,9 +226,7 @@ class DefaultTransportRequest implements TransportRequest {
fallbackRequest.connect(this.handler, this.future);
}
else {
if (logger.isErrorEnabled()) {
logger.error("No more fallback transports after " + DefaultTransportRequest.this, ex);
}
logger.error("No more fallback transports after " + DefaultTransportRequest.this, ex);
if (ex != null) {
this.future.setException(ex);
}