Fix for #386 [websocket] GlassFish's WebSocket implementation scope i…

…ssue
Atmosphere · May 29, 2012 · 63c9297 · 63c9297
1 parent 9d88b64
commit 63c9297
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/container/GlassFishWebSocketSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/GlassFishWebSocketSupport.java
@@ -96,7 +96,7 @@ public void init(ServletConfig sc) throws ServletException {
     public void shutdown() {
         WebSocketEngine.getEngine().unregister(application);
         super.shutdown();
-     }
+    }
 
     /**
      * {@inheritDoc}
@@ -108,8 +108,7 @@ public Action service(AtmosphereRequest request, AtmosphereResponse response)
         if (!Utils.webSocketEnabled(request)) {
             return super.service(request, response);
         } else {
-            Action action = suspended(request, response);
-            return action;
+            return suspended(request, response);;
         }
     }
 
@@ -126,7 +125,6 @@ public String getContainerName() {
     private final static class GrizzlyApplication extends WebSocketApplication {
 
         private final AtmosphereConfig config;
-        private WebSocketProcessor webSocketProcessor;
 
         public GrizzlyApplication(AtmosphereConfig config) {
             this.config = config;
@@ -154,7 +152,9 @@ public void onConnect(com.sun.grizzly.websockets.WebSocket w) {
                     logger.trace("", e);
                 }
 
-                webSocketProcessor = new WebSocketProcessor(config.framework(), new GrizzlyWebSocket(webSocket, config), config.framework().getWebSocketProtocol());
+                WebSocketProcessor webSocketProcessor = new WebSocketProcessor(config.framework(),
+                        new GrizzlyWebSocket(webSocket, config), config.framework().getWebSocketProtocol());
+                webSocket.getRequest().setAttribute("grizzly.webSocketProcessor", webSocketProcessor);
                 webSocketProcessor.dispatch(r);
             } catch (Exception e) {
                 logger.warn("failed to connect to web socket", e);
@@ -170,20 +170,31 @@ public boolean isApplicationRequest(Request request) {
         public void onClose(com.sun.grizzly.websockets.WebSocket w, DataFrame df) {
             super.onClose(w, df);
             logger.trace("onClose {} ", w);
-            // TODO: Need to talk to Ryan about that one.
-            webSocketProcessor.close(1000);
+            DefaultWebSocket webSocket = DefaultWebSocket.class.cast(w);
+            if (webSocket.getRequest().getAttribute("grizzly.webSocketProcessor") != null) {
+                WebSocketProcessor webSocketProcessor = (WebSocketProcessor) webSocket.getRequest().getAttribute("grizzly.webSocketProcessor");
+                webSocketProcessor.close(1000);
+            }
         }
 
         @Override
         public void onMessage(com.sun.grizzly.websockets.WebSocket w, String text) {
             logger.trace("onMessage {} ", w);
-            webSocketProcessor.invokeWebSocketProtocol(text);
+            DefaultWebSocket webSocket = DefaultWebSocket.class.cast(w);
+            if (webSocket.getRequest().getAttribute("grizzly.webSocketProcessor") != null) {
+                WebSocketProcessor webSocketProcessor = (WebSocketProcessor) webSocket.getRequest().getAttribute("grizzly.webSocketProcessor");
+                webSocketProcessor.invokeWebSocketProtocol(text);
+            }
         }
 
         @Override
         public void onMessage(com.sun.grizzly.websockets.WebSocket w, byte[] bytes) {
             logger.trace("onMessage (bytes) {} ", w);
-            webSocketProcessor.invokeWebSocketProtocol(bytes, 0, bytes.length);
+            DefaultWebSocket webSocket = DefaultWebSocket.class.cast(w);
+            if (webSocket.getRequest().getAttribute("grizzly.webSocketProcessor") != null) {
+                WebSocketProcessor webSocketProcessor = (WebSocketProcessor) webSocket.getRequest().getAttribute("grizzly.webSocketProcessor");
+                webSocketProcessor.invokeWebSocketProtocol(bytes, 0, bytes.length);
+            }
         }
 
         @Override