Author: remy.maucherat(a)jboss.com Date: 2014-05-26 17:23:20 -0400 (Mon, 26 May 2014) New Revision: 2420 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java Log: Revert r2418 (useless extra sync). 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-26 13:35:49 UTC (rev 2419) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-05-26 21:23:20 UTC (rev 2420) @@ -928,10 +928,10 @@ public void run() { try { Handler.SocketState state = null; - synchronized (channel) { - if (status == null) { - state = handler.process(channel); - } else { + if (status == null) { + state = handler.process(channel); + } else { + synchronized (channel) { state = handler.event(channel, status); } }