Author: remy.maucherat(a)jboss.com Date: 2014-03-17 13:36:13 -0400 (Mon, 17 Mar 2014) New Revision: 2391 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java Log: Unrevert, although the spec says something about this being wrong, nothing can be done with a closed session, which only leads to problems. 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-03-17 14:36:42 UTC (rev 2390) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-03-17 17:36:13 UTC (rev 2391) @@ -405,8 +405,8 @@ state = State.CLOSING; + fireEndpointOnClose(closeReasonLocal); sendCloseMessage(closeReasonMessage); - fireEndpointOnClose(closeReasonLocal); state = State.CLOSED; } @@ -428,8 +428,8 @@ synchronized (stateLock) { if (state == State.OPEN) { + fireEndpointOnClose(closeReason); sendCloseMessage(closeReason); - fireEndpointOnClose(closeReason); state = State.CLOSED; }