From db4de526d2e9f231910d8946269d2e399863d26f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 23 Apr 2013 12:10:19 -0700 Subject: [PATCH] Minor polish and FIXMEs --- .../sockjs/server/transport/SockJsWebSocketHandler.java | 2 +- .../websocket/server/RequestUpgradeStrategy.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java index 0e50456957..776df0e30b 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java @@ -104,7 +104,7 @@ public class SockJsWebSocketHandler implements TextMessageHandler { Assert.notNull(wsSession, "wsSession is required"); String path = wsSession.getURI().getPath(); String[] segments = StringUtils.tokenizeToStringArray(path, "/"); - Assert.isTrue(segments.length > 3, "SockJS request should have at least 3 patgh segments: " + path); + Assert.isTrue(segments.length > 3, "SockJS request should have at least 3 path segments: " + path); return segments[segments.length-2]; } diff --git a/spring-websocket/src/main/java/org/springframework/websocket/server/RequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/websocket/server/RequestUpgradeStrategy.java index 6d2827baaa..fadf15c99e 100644 --- a/spring-websocket/src/main/java/org/springframework/websocket/server/RequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/websocket/server/RequestUpgradeStrategy.java @@ -43,6 +43,7 @@ public interface RequestUpgradeStrategy { * @param handler the handler for WebSocket messages */ void upgrade(ServerHttpRequest request, ServerHttpResponse response, String selectedProtocol, - HandlerProvider handler) throws Exception; + HandlerProvider handlerProvider) throws Exception; + // FIXME how to indicate failure to upgrade? }