Fix for #280 [tomcat] Sprint exception with WebSocket

Atmosphere · Apr 12, 2012 · 382723f · 382723f
1 parent bfedc84
commit 382723f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/container/Tomcat7AsyncSupportWithWebSocket.java b/modules/cpr/src/main/java/org/atmosphere/container/Tomcat7AsyncSupportWithWebSocket.java
@@ -44,6 +44,7 @@
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
@@ -113,7 +114,11 @@ public AtmosphereFramework.Action service(AtmosphereRequest req, AtmosphereRespo
                 res.setHeader("Sec-WebSocket-Protocol", subProtocol);
             }
 
-            RequestFacade facade = (RequestFacade) req.wrappedRequest();
+            HttpServletRequest hsr = req.wrappedRequest();
+            while (hsr instanceof HttpServletRequestWrapper)
+                hsr = (HttpServletRequest) ((HttpServletRequestWrapper) hsr).getRequest();
+
+            RequestFacade facade = (RequestFacade) hsr;
             StreamInbound inbound = new TomcatWebSocketHandler(AtmosphereRequest.loadInMemory(req, true), config.framework(), config.framework().getWebSocketProtocol());
             facade.doUpgrade(inbound);
         }

diff --git a/samples/jquery-websockethandler-pubsub/src/main/webapp/index.html b/samples/jquery-websockethandler-pubsub/src/main/webapp/index.html
@@ -34,20 +34,20 @@
             }
 
             function subscribe() {
-                var request = { url : document.location.toString() + 'pubsub/' + getElementByIdValue('topic'),
-                    transport: getElementByIdValue('transport')};
-
-                request.onMessage = function (response) {
-                    detectedTransport = response.transport;
-                    if (response.status == 200) {
-                        var data = response.responseBody;
-                        if (data.length > 0) {
-                            $('ul').prepend($('<li></li>').text(" Message Received: " + data + " but detected transport is " + detectedTransport));
-                        }
-                    }
-                };
+var request = { url : document.location.toString() + 'pubsub/' + getElementByIdValue('topic'),
+    transport: getElementByIdValue('transport')};
+
+request.onMessage = function (response) {
+    detectedTransport = response.transport;
+    if (response.status == 200) {
+        var data = response.responseBody;
+        if (data.length > 0) {
+            $('ul').prepend($('<li></li>').text(" Message Received: " + data + " but detected transport is " + detectedTransport));
+        }
+    }
+};
 
-                subSocket = socket.subscribe(request);
+subSocket = socket.subscribe(request);
             }
 
             function unsubscribe(){