Author: markt Date: Thu Mar 15 12:07:52 2012 New Revision: 1300948 URL: http://svn.apache.org/viewvc?rev=1300948&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52858 Fix high CPU load caused by tight(ish) loop when client doesn't read any data
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1300948&r1=1300947&r2=1300948&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Mar 15 12:07:52 2012 @@ -1254,7 +1254,7 @@ public class NioEndpoint extends Abstrac public boolean processSendfile(SelectionKey sk, KeyAttachment attachment, boolean reg, boolean event) { NioChannel sc = null; try { - //unreg(sk,attachment);//only do this if we do process send file on a separate thread + unreg(sk, attachment, sk.readyOps()); SendfileData sd = attachment.getSendfileData(); if ( sd.fchannel == null ) { File f = new File(sd.fileName); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org