[jbossweb-commits] JBossWeb SVN: r2587 - tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket.

Author: remy.maucherat(a)jboss.com Date: 2015-01-27 07:51:50 -0500 (Tue, 27 Jan 2015) New Revision: 2587 Modified: tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Log: [hack the tag since it is not really released yet] BZ1155189: As found out by Radim Hatlapatka, entropy can cause a delay in the middle of an IO operation. Move the entropy problem to the initial connection (unless the client sends messages concurrently). Modified: tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java =================================================================== --- tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 2015-01-27 12:47:55 UTC (rev 2586) +++ tags/JBOSSWEB_7_5_5_FINAL/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 2015-01-27 12:51:50 UTC (rev 2587) @@ -209,6 +209,9 @@ boolean secure = false; + // Entropy can cause a delay, so initialize here at least one random + Util.generateMask(); + String scheme = path.getScheme(); if (!("ws".equalsIgnoreCase(scheme) || "wss".equalsIgnoreCase(scheme))) {