Author: markt Date: Mon Nov 10 16:47:47 2014 New Revision: 1637939 URL: http://svn.apache.org/r1637939 Log: Rename for clarity
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java?rev=1637939&r1=1637938&r2=1637939&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java Mon Nov 10 16:47:47 2014 @@ -35,8 +35,8 @@ public class AprProcessor extends Abstra private static final int INFINITE_TIMEOUT = -1; public AprProcessor(SocketWrapperBase<Long> wrapper, ByteBuffer leftOverInput, - HttpUpgradeHandler httpUpgradeProcessor, int asyncWriteBufferSize) { - super(httpUpgradeProcessor, + HttpUpgradeHandler httpUpgradeHandler, int asyncWriteBufferSize) { + super(httpUpgradeHandler, new UpgradeServletInputStream(wrapper), new UpgradeServletOutputStream(wrapper, asyncWriteBufferSize)); ((AprSocketWrapper) wrapper).setLeftOverInput(leftOverInput); Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java?rev=1637939&r1=1637938&r2=1637939&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java Mon Nov 10 16:47:47 2014 @@ -34,8 +34,8 @@ public class Nio2Processor extends Abstr private static final int INFINITE_TIMEOUT = -1; public Nio2Processor(SocketWrapperBase<Nio2Channel> wrapper, ByteBuffer leftoverInput, - HttpUpgradeHandler httpUpgradeProcessor, int asyncWriteBufferSize) { - super(httpUpgradeProcessor, + HttpUpgradeHandler httpUpgradeHandler, int asyncWriteBufferSize) { + super(httpUpgradeHandler, new UpgradeServletInputStream(wrapper), new UpgradeServletOutputStream(wrapper, asyncWriteBufferSize)); Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java?rev=1637939&r1=1637938&r2=1637939&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java Mon Nov 10 16:47:47 2014 @@ -34,8 +34,8 @@ public class NioProcessor extends Abstra private static final int INFINITE_TIMEOUT = -1; public NioProcessor(SocketWrapperBase<NioChannel> wrapper, ByteBuffer leftoverInput, - HttpUpgradeHandler httpUpgradeProcessor, int asyncWriteBufferSize) { - super(httpUpgradeProcessor, + HttpUpgradeHandler httpUpgradeHandler, int asyncWriteBufferSize) { + super(httpUpgradeHandler, new UpgradeServletInputStream(wrapper), new UpgradeServletOutputStream(wrapper, asyncWriteBufferSize)); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org