Author: remy.maucherat(a)jboss.com Date: 2014-05-24 09:07:18 -0400 (Sat, 24 May 2014) New Revision: 2418 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java Log: Sync process with event as some random behavior is still reported. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-05-23 22:13:48 UTC (rev 2417) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-05-24 13:07:18 UTC (rev 2418) @@ -928,10 +928,10 @@ public void run() { try { Handler.SocketState state = null; - if (status == null) { - state = handler.process(channel); - } else { - synchronized (channel) { + synchronized (channel) { + if (status == null) { + state = handler.process(channel); + } else { state = handler.event(channel, status); } }