Author: remy.maucherat(a)jboss.com Date: 2014-01-23 10:25:58 -0500 (Thu, 23 Jan 2014) New Revision: 2355 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java Log: Revert as the WS spec is explicit about that (will see the test result). Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-23 15:10:04 UTC (rev 2354) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-23 15:25:58 UTC (rev 2355) @@ -405,8 +405,8 @@ state = State.CLOSING; + sendCloseMessage(closeReasonMessage); fireEndpointOnClose(closeReasonLocal); - sendCloseMessage(closeReasonMessage); state = State.CLOSED; } @@ -428,8 +428,8 @@ synchronized (stateLock) { if (state == State.OPEN) { + sendCloseMessage(closeReason); fireEndpointOnClose(closeReason); - sendCloseMessage(closeReason); state = State.CLOSED; }