Author: markt Date: Sat Dec 12 22:09:59 2015 New Revision: 1719743 URL: http://svn.apache.org/viewvc?rev=1719743&view=rev Log: Fix the TestWebSocketFrameClientSSL test failures
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1719743&r1=1719742&r2=1719743&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Sat Dec 12 22:09:59 2015 @@ -473,6 +473,8 @@ public class WsSession implements Sessio return; } + state = State.OUTPUT_CLOSED; + if (log.isDebugEnabled()) { log.debug(sm.getString("wsSession.doClose", id)); } @@ -483,8 +485,6 @@ public class WsSession implements Sessio fireEndpointOnError(e); } - state = State.OUTPUT_CLOSED; - sendCloseMessage(closeReasonMessage); fireEndpointOnClose(closeReasonLocal); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org