Author: remy.maucherat(a)jboss.com Date: 2014-05-26 09:35:49 -0400 (Mon, 26 May 2014) New Revision: 2419 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java Log: Revert again. Besides cosmetics when using a closed session during the event processing, it doesn't cause any actual issues, but it could have side effects. 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-05-24 13:07:18 UTC (rev 2418) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-05-26 13:35:49 UTC (rev 2419) @@ -406,8 +406,8 @@ state = State.CLOSING; + sendCloseMessage(closeReasonMessage); fireEndpointOnClose(closeReasonLocal); - sendCloseMessage(closeReasonMessage); state = State.CLOSED; } @@ -429,8 +429,8 @@ synchronized (stateLock) { if (state == State.OPEN) { + sendCloseMessage(closeReason); fireEndpointOnClose(closeReason); - sendCloseMessage(closeReason); state = State.CLOSED; }