Fix for #505 [websocket] Possible memory leak on Tomcat with WebSocket

Atmosphere · Jul 12, 2012 · c26b5b1 · c26b5b1
1 parent 4c18af6
commit c26b5b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereRequest.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereRequest.java
@@ -1516,7 +1516,6 @@ public final static AtmosphereRequest cloneRequest(HttpServletRequest request, b
         if (AtmosphereRequest.class.isAssignableFrom(request.getClass())) {
             b = AtmosphereRequest.class.cast(request).b;
             isWrapped = true;
-            r = request;
         } else {
             b = new Builder();
             b.request(request);
@@ -1535,9 +1534,10 @@ public final static AtmosphereRequest cloneRequest(HttpServletRequest request, b
 
         if (loadInMemory) {
             r = new NoOpsRequest();
-            load(request, b);
             if (isWrapped) {
                 load(b.request, b);
+            } else {
+                load(request, b);
             }
             b.request(r);
         }

diff --git a/modules/cpr/src/main/java/org/atmosphere/websocket/WebSocketProcessor.java b/modules/cpr/src/main/java/org/atmosphere/websocket/WebSocketProcessor.java
@@ -195,13 +195,9 @@ protected final void dispatch(final AtmosphereRequest request, final AtmosphereR
             return;
         }
 
-        AtmosphereResource resource = (AtmosphereResource) request.getAttribute(FrameworkConfig.ATMOSPHERE_RESOURCE);
-
         if (r.getStatus() >= 400) {
             webSocketProtocol.onError(webSocket, new WebSocketException("Status code higher or equal than 400", r));
         }
-
-        webSocket.resource(resource);
     }
 
     public WebSocket webSocket() {