Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

434395 - WebSocket / memory leak, WebSocketSession not cleaned up in abnormal closure cases 

+ Cleanup for read, bug fix for this occurred in prior commits
  surrounding CLOSE handling
This commit is contained in:
Joakim Erdfelt 2014-05-08 14:08:20 -07:00
parent 5db6f65354
commit f9fad8f49f
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadServer.java
View File

@ -155,7 +155,7 @@ public class BlockheadServer
public void echoMessage(int expectedFrames, TimeUnit timeoutUnit, int timeoutDuration) throws IOException, TimeoutException public void echoMessage(int expectedFrames, TimeUnit timeoutUnit, int timeoutDuration) throws IOException, TimeoutException
{ {
LOG.debug("Echo Frames [expecting {}]",expectedFrames); LOG.debug("Echo Frames [expecting {}]",expectedFrames);
IncomingFramesCapture cap = readFrames(expectedFrames,timeoutUnit,timeoutDuration); IncomingFramesCapture cap = readFrames(expectedFrames,timeoutDuration,timeoutUnit);
// now echo them back. // now echo them back.
for (Frame frame : cap.getFrames()) for (Frame frame : cap.getFrames())
{ {
@ -329,15 +329,6 @@ public class BlockheadServer
return len; return len;
} }
/**
* @deprecated use {@link #readFrames(int, int, TimeUnit)} for correct parameter order
*/
@Deprecated
public IncomingFramesCapture readFrames(int expectedCount, TimeUnit timeoutUnit, int timeoutDuration) throws IOException, TimeoutException
{
return readFrames(expectedCount,timeoutDuration,timeoutUnit);
}
public IncomingFramesCapture readFrames(int expectedCount, int timeoutDuration, TimeUnit timeoutUnit) throws IOException, TimeoutException public IncomingFramesCapture readFrames(int expectedCount, int timeoutDuration, TimeUnit timeoutUnit) throws IOException, TimeoutException
{ {
LOG.debug("Read: waiting for {} frame(s) from client",expectedCount); LOG.debug("Read: waiting for {} frame(s) from client",expectedCount);