Fix for #223 [websocket] onControl must not be propagated to Atmosphe…

…reHandler
Atmosphere · Mar 14, 2012 · c644bef · c644bef
1 parent 5fe168f
commit c644bef
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 2,374 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/container/JettyWebSocketHandler.java b/modules/cpr/src/main/java/org/atmosphere/container/JettyWebSocketHandler.java
@@ -130,7 +130,6 @@ public void onMessage(byte[] data, int offset, int length) {
     @Override
     public boolean onControl(byte controlCode, byte[] data, int offset, int length) {
         logger.trace("WebSocket.onControl.");
-        webSocketProcessor.invokeWebSocketProtocol(data, offset, length);
         try {
             webSocketProcessor.notifyListener(new WebSocketEventListener.WebSocketEvent(new String(data, offset, length, "UTF-8"), CONTROL, webSocketProcessor.webSocket()));
         } catch (UnsupportedEncodingException e) {

diff --git a/samples/chat/src/main/webapp/images/body-background.png b/samples/chat/src/main/webapp/images/body-background.png
diff --git a/samples/chat/src/main/webapp/images/header-background.png b/samples/chat/src/main/webapp/images/header-background.png
diff --git a/samples/chat/src/main/webapp/images/main-background.png b/samples/chat/src/main/webapp/images/main-background.png
diff --git a/samples/chat/src/main/webapp/javascripts/behaviour.js b/samples/chat/src/main/webapp/javascripts/behaviour.js