Author: remy.maucherat(a)jboss.com Date: 2014-01-23 07:15:22 -0500 (Thu, 23 Jan 2014) New Revision: 2352 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java Log: Try some fixes. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 2014-01-22 09:10:12 UTC (rev 2351) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 2014-01-23 12:15:22 UTC (rev 2352) @@ -232,6 +232,7 @@ } else { f2sh.get(timeout, TimeUnit.MILLISECONDS); } + payload.clear(); } catch (InterruptedException e) { throw new IOException(e); } catch (ExecutionException e) { 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-22 09:10:12 UTC (rev 2351) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-01-23 12:15:22 UTC (rev 2352) @@ -404,8 +404,8 @@ state = State.CLOSING; + fireEndpointOnClose(closeReasonLocal); sendCloseMessage(closeReasonMessage); - fireEndpointOnClose(closeReasonLocal); state = State.CLOSED; } @@ -427,8 +427,8 @@ synchronized (stateLock) { if (state == State.OPEN) { + fireEndpointOnClose(closeReason); sendCloseMessage(closeReason); - fireEndpointOnClose(closeReason); state = State.CLOSED; }