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

Fix failing test

Browse Source
This commit is contained in:
Rossen Stoyanchev
2014-06-29 22:09:14 -04:00
parent 974bd43f28
commit b1aebb2c0c
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java
View File

@@ -33,6 +33,8 @@ import org.springframework.web.socket.sockjs.transport.TransportHandlingSockJsSe
import org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService;
import org.springframework.web.socket.sockjs.transport.handler.WebSocketTransportHandler;
import java.util.concurrent.ScheduledThreadPoolExecutor;
/**
* Provides utility methods for parsing common WebSocket XML namespace elements.
*
@@ -44,7 +46,7 @@ class WebSocketNamespaceUtils {
// Check for setRemoveOnCancelPolicy method - available on JDK 7 and higher
private static boolean hasRemoveOnCancelPolicyMethod = ClassUtils.hasMethod(
WebSocketConfigurationSupport.class, "setRemoveOnCancelPolicy", boolean.class);
ScheduledThreadPoolExecutor.class, "setRemoveOnCancelPolicy", boolean.class);
public static RuntimeBeanReference registerHandshakeHandler(Element element, ParserContext parserContext, Object source) {

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

@@ -21,6 +21,8 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.util.ClassUtils;
import org.springframework.web.servlet.HandlerMapping;
import java.util.concurrent.ScheduledThreadPoolExecutor;
/**
* Configuration support for WebSocket request handling.
*
@@ -31,7 +33,7 @@ public class WebSocketConfigurationSupport {
// Check for setRemoveOnCancelPolicy method - available on JDK 7 and higher
private static boolean hasRemoveOnCancelPolicyMethod = ClassUtils.hasMethod(
WebSocketConfigurationSupport.class, "setRemoveOnCancelPolicy", boolean.class);
ScheduledThreadPoolExecutor.class, "setRemoveOnCancelPolicy", boolean.class);
@Bean

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

@@ -17,6 +17,7 @@
package org.springframework.web.socket.config.annotation;
import java.util.Collections;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.springframework.beans.factory.config.CustomScopeConfigurer;
import org.springframework.context.annotation.Bean;
@@ -44,7 +45,7 @@ public abstract class WebSocketMessageBrokerConfigurationSupport extends Abstrac
// Check for setRemoveOnCancelPolicy method - available on JDK 7 and higher
private static boolean hasRemoveOnCancelPolicyMethod = ClassUtils.hasMethod(
WebSocketConfigurationSupport.class, "setRemoveOnCancelPolicy", boolean.class);
ScheduledThreadPoolExecutor.class, "setRemoveOnCancelPolicy", boolean.class);
private WebSocketTransportRegistration transportRegistration;