Changing a public API method is something I would do for trunk. I'm not sure about a .28 release that is considered stable.
Filip > -----Original Message----- > From: kkoli...@apache.org [mailto:kkoli...@apache.org] > Sent: Thursday, May 24, 2012 5:02 PM > To: dev@tomcat.apache.org > Subject: svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ > java/org/apache/coyote/http11/Http11NioProcessor.java > java/org/apache/tomcat/util/net/NioEndpoint.java > > Author: kkolinko > Date: Thu May 24 23:02:12 2012 > New Revision: 1342473 > > URL: http://svn.apache.org/viewvc?rev=1342473&view=rev > Log: > Merged revision 1342320 from tomcat/trunk: > Simplify. > The "req" argument in processSendfile() is always true, and it is no > more used since r1340215 > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > va > > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > > Propchange: tomcat/tc7.0.x/trunk/ > ------------------------------------------------------------------------ > ------ > Merged /tomcat/trunk:r1342320 > > Modified: > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > va > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote > /http11/Http11NioProcessor.java?rev=1342473&r1=1342472&r2=1342473&view=d > iff > ======================================================================== > ====== > --- > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > va (original) > +++ > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > va Thu May 24 23:02:12 2012 > @@ -284,7 +284,7 @@ public class Http11NioProcessor extends > > socketWrapper.getSocket().getPoller().getSelector()); > //do the first write on this thread, might as well > openSocket = > socketWrapper.getSocket().getPoller().processSendfile(key, > - (KeyAttachment) socketWrapper, true, true); > + (KeyAttachment) socketWrapper, true); > return true; > } > return false; > > Modified: > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat > /util/net/NioEndpoint.java?rev=1342473&r1=1342472&r2=1342473&view=diff > ======================================================================== > ====== > --- > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > (original) > +++ > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > Thu May 24 23:02:12 2012 > @@ -1230,7 +1230,7 @@ public class NioEndpoint extends Abstrac > NioChannel channel = attachment.getChannel(); > if (sk.isReadable() || sk.isWritable() ) { > if ( attachment.getSendfileData() != null ) { > - processSendfile(sk,attachment,true, false); > + processSendfile(sk,attachment, false); > } else if ( attachment.getComet() ) { > //check if thread is available > if ( isWorkerAvailable() ) { > @@ -1276,7 +1276,7 @@ public class NioEndpoint extends Abstrac > return result; > } > > - public boolean processSendfile(SelectionKey sk, KeyAttachment > attachment, boolean reg, boolean event) { > + public boolean processSendfile(SelectionKey sk, KeyAttachment > attachment, boolean event) { > NioChannel sc = null; > try { > unreg(sk, attachment, sk.readyOps()); > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
