Author: markt Date: Mon Jan 12 23:38:24 2015 New Revision: 1651232 URL: http://svn.apache.org/r1651232 Log: Better parameter name
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1651232&r1=1651231&r2=1651232&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Jan 12 23:38:24 2015 @@ -783,7 +783,7 @@ public abstract class AbstractProtocol<S boolean addToPoller); protected abstract Processor<S> createUpgradeProcessor( SocketWrapperBase<S> socket, ByteBuffer leftoverInput, - HttpUpgradeHandler httpUpgradeProcessor) throws IOException; + HttpUpgradeHandler httpUpgradeHandler) throws IOException; protected void register(AbstractProcessor<S> processor) { if (getProtocol().getDomain() != null) { Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1651232&r1=1651231&r2=1651232&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Jan 12 23:38:24 2015 @@ -314,9 +314,9 @@ public class Http11AprProtocol extends A @Override protected Processor<Long> createUpgradeProcessor( SocketWrapperBase<Long> socket, ByteBuffer leftoverInput, - HttpUpgradeHandler httpUpgradeProcessor) + HttpUpgradeHandler httpUpgradeHandler) throws IOException { - return new UpgradeProcessor<>(socket, leftoverInput, httpUpgradeProcessor); + return new UpgradeProcessor<>(socket, leftoverInput, httpUpgradeHandler); } } } Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1651232&r1=1651231&r2=1651232&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Mon Jan 12 23:38:24 2015 @@ -232,9 +232,9 @@ public class Http11Nio2Protocol extends @Override protected Processor<Nio2Channel> createUpgradeProcessor( SocketWrapperBase<Nio2Channel> socket, ByteBuffer leftoverInput, - HttpUpgradeHandler httpUpgradeProcessor) + HttpUpgradeHandler httpUpgradeHandler) throws IOException { - return new UpgradeProcessor<>(socket, leftoverInput, httpUpgradeProcessor); + return new UpgradeProcessor<>(socket, leftoverInput, httpUpgradeHandler); } @Override Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1651232&r1=1651231&r2=1651232&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Jan 12 23:38:24 2015 @@ -270,9 +270,9 @@ public class Http11NioProtocol extends A @Override protected Processor<NioChannel> createUpgradeProcessor( SocketWrapperBase<NioChannel> socket, ByteBuffer leftoverInput, - HttpUpgradeHandler httpUpgradeProcessor) + HttpUpgradeHandler httpUpgradeHandler) throws IOException { - return new UpgradeProcessor<>(socket, leftoverInput, httpUpgradeProcessor); + return new UpgradeProcessor<>(socket, leftoverInput, httpUpgradeHandler); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org