Author: markt Date: Fri Jan 23 19:03:05 2015 New Revision: 1654322 URL: http://svn.apache.org/r1654322 Log: Re-order in preparation for further refactoring. Always set SendfileData.keepalive first.
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1654322&r1=1654321&r2=1654322&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Fri Jan 23 19:03:05 2015 @@ -95,8 +95,8 @@ public class Http11AprProcessor extends openSocket = keepAlive; // Do sendfile as needed: add socket to sendfile and end if (sendfileData != null && !getErrorState().isError()) { - sendfileData.socket = socketWrapper.getSocket().longValue(); sendfileData.keepAlive = keepAlive; + sendfileData.socket = socketWrapper.getSocket().longValue(); if (!((AprEndpoint)endpoint).getSendfile().add(sendfileData)) { // Didn't send all of the data to sendfile. if (sendfileData.socket == 0) { Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1654322&r1=1654321&r2=1654322&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Fri Jan 23 19:03:05 2015 @@ -125,8 +125,8 @@ public class Http11Nio2Processor extends openSocket = keepAlive; // Do sendfile as needed: add socket to sendfile and end if (sendfileData != null && !getErrorState().isError()) { - ((Nio2Endpoint.Nio2SocketWrapper) socketWrapper).setSendfileData(sendfileData); sendfileData.keepAlive = keepAlive; + ((Nio2Endpoint.Nio2SocketWrapper) socketWrapper).setSendfileData(sendfileData); switch (((Nio2Endpoint) endpoint) .processSendfile((Nio2Endpoint.Nio2SocketWrapper) socketWrapper)) { case DONE: Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1654322&r1=1654321&r2=1654322&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Fri Jan 23 19:03:05 2015 @@ -118,8 +118,8 @@ public class Http11NioProcessor extends openSocket = keepAlive; // Do sendfile as needed: add socket to sendfile and end if (sendfileData != null && !getErrorState().isError()) { - ((NioSocketWrapper) socketWrapper).setSendfileData(sendfileData); sendfileData.keepAlive = keepAlive; + ((NioSocketWrapper) socketWrapper).setSendfileData(sendfileData); SelectionKey key = socketWrapper.getSocket().getIOChannel().keyFor( socketWrapper.getSocket().getPoller().getSelector()); //do the first write on this thread, might as well --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org