Author: remm
Date: Thu Jan 23 14:59:45 2014
New Revision: 1560704
URL: http://svn.apache.org/r1560704
Log:
Revert: Call onClose before actually closing anything (sending a close message
closes the endpoint).
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1560704&r1=1560703&r2=1560704&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Thu Jan 23
14:59:45 2014
@@ -414,8 +414,8 @@ public class WsSession implements Sessio
state = State.CLOSING;
- fireEndpointOnClose(closeReasonLocal);
sendCloseMessage(closeReasonMessage);
+ fireEndpointOnClose(closeReasonLocal);
state = State.CLOSED;
}
@@ -437,8 +437,8 @@ public class WsSession implements Sessio
synchronized (stateLock) {
if (state == State.OPEN) {
- fireEndpointOnClose(closeReason);
sendCloseMessage(closeReason);
+ fireEndpointOnClose(closeReason);
state = State.CLOSED;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
