You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/09/06 20:25:40 UTC
svn commit: r1520657 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Author: markt
Date: Fri Sep 6 18:25:40 2013
New Revision: 1520657
URL: http://svn.apache.org/r1520657
Log:
Don't register the ReadListener until after onOpen has completed as MessageHandler instances are likely to be registered during onOpen. This prevents incoming messages from being processed until the onOpen event completes.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1520655
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1520657&r1=1520656&r2=1520657&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java Fri Sep 6 18:25:40 2013
@@ -124,11 +124,11 @@ public class WsHttpUpgradeHandler implem
WsFrameServer wsFrame = new WsFrameServer(
sis,
wsSession);
- sis.setReadListener(new WsReadListener(this, wsFrame));
sos.setWriteListener(
new WsWriteListener(this, wsRemoteEndpointServer));
ep.onOpen(wsSession, endpointConfig);
webSocketContainer.registerSession(ep, wsSession);
+ sis.setReadListener(new WsReadListener(this, wsFrame));
} catch (DeploymentException e) {
throw new IllegalArgumentException(e);
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org