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

393383 delay onClose call until closeOut is done

This commit is contained in:
Greg Wilkins 2012-11-02 10:28:23 +11:00
parent e93a254306
commit ba06103442
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
View File

@ -323,13 +323,13 @@ public class WebSocketConnectionRFC6455 extends AbstractConnection implements We
try
{
if (tell_app)
_webSocket.onClose(code,message);
if (!closed_out)
closeOut(code,message);
}
finally
{
if (!closed_out)
closeOut(code,message);
if (tell_app)
_webSocket.onClose(code,message);
}
}
@ -353,7 +353,7 @@ public class WebSocketConnectionRFC6455 extends AbstractConnection implements We
}
try
{
{
if (tell_app)
_webSocket.onClose(code,message);
}

6
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
View File

@ -1337,7 +1337,7 @@ public class WebSocketMessageRFC6455Test
output.flush();
// Make sure the read times out if there are problems with the implementation
socket.setSoTimeout(1000);
socket.setSoTimeout(10000);
InputStream input = socket.getInputStream();
@ -1347,7 +1347,7 @@ public class WebSocketMessageRFC6455Test
skipTo("\r\n\r\n",input);
assertTrue(__serverWebSocket.awaitConnected(1000));
assertTrue(__serverWebSocket.awaitConnected(10000));
assertNotNull(__serverWebSocket.connection);
assertEquals(0x81,input.read());
@ -1355,7 +1355,7 @@ public class WebSocketMessageRFC6455Test
lookFor("sent on connect",input);
socket.close();
assertTrue(__serverWebSocket.awaitDisconnected(500));
assertTrue(__serverWebSocket.awaitDisconnected(10000));
try
{