Author: markt
Date: Mon Nov 10 16:45:33 2014
New Revision: 1637920
URL: http://svn.apache.org/r1637920
Log:
No longer need to pass NioSelectorPool in constructors in I/O streams
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
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=1637920&r1=1637919&r2=1637920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Nov
10 16:45:33 2014
@@ -297,7 +297,6 @@ public class Http11NioProtocol extends A
HttpUpgradeHandler httpUpgradeProcessor)
throws IOException {
return new NioProcessor(socket, leftoverInput,
httpUpgradeProcessor,
- proto.getEndpoint().getSelectorPool(),
proto.getUpgradeAsyncWriteBufferSize());
}
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=1637920&r1=1637919&r2=1637920&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:45:33 2014
@@ -23,7 +23,6 @@ import javax.servlet.http.HttpUpgradeHan
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.NioChannel;
-import org.apache.tomcat.util.net.NioSelectorPool;
import org.apache.tomcat.util.net.SocketWrapperBase;
public class NioProcessor extends AbstractProcessor<NioChannel> {
@@ -35,11 +34,10 @@ public class NioProcessor extends Abstra
private static final int INFINITE_TIMEOUT = -1;
public NioProcessor(SocketWrapperBase<NioChannel> wrapper, ByteBuffer
leftoverInput,
- HttpUpgradeHandler httpUpgradeProcessor, NioSelectorPool pool,
- int asyncWriteBufferSize) {
+ HttpUpgradeHandler httpUpgradeProcessor, int asyncWriteBufferSize)
{
super(httpUpgradeProcessor,
- new NioServletInputStream(wrapper, pool),
- new NioServletOutputStream(wrapper, asyncWriteBufferSize,
pool));
+ new NioServletInputStream(wrapper),
+ new NioServletOutputStream(wrapper, asyncWriteBufferSize));
wrapper.setTimeout(INFINITE_TIMEOUT);
if (leftoverInput != null) {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java?rev=1637920&r1=1637919&r2=1637920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
Mon Nov 10 16:45:33 2014
@@ -31,10 +31,9 @@ public class NioServletInputStream exten
private final NioChannel channel;
private final NioSelectorPool pool;
- public NioServletInputStream(SocketWrapperBase<NioChannel> wrapper,
- NioSelectorPool pool) {
+ public NioServletInputStream(SocketWrapperBase<NioChannel> wrapper) {
this.channel = wrapper.getSocket();
- this.pool = pool;
+ this.pool = ((NioEndpoint) wrapper.getEndpoint()).getSelectorPool();
}
@Override
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java?rev=1637920&r1=1637919&r2=1637920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
Mon Nov 10 16:45:33 2014
@@ -33,10 +33,10 @@ public class NioServletOutputStream exte
public NioServletOutputStream(SocketWrapperBase<NioChannel> socketWrapper,
- int asyncWriteBufferSize, NioSelectorPool pool) {
+ int asyncWriteBufferSize) {
super(socketWrapper, asyncWriteBufferSize);
channel = socketWrapper.getSocket();
- this.pool = pool;
+ this.pool = ((NioEndpoint)
socketWrapper.getEndpoint()).getSelectorPool();
maxWrite = channel.getBufHandler().getWriteBuffer().capacity();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1637920&r1=1637919&r2=1637920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Nov
10 16:45:33 2014
@@ -77,6 +77,10 @@ public abstract class SocketWrapperBase<
return socket;
}
+ public AbstractEndpoint<E> getEndpoint() {
+ return endpoint;
+ }
+
public boolean isAsync() { return async; }
public void setAsync(boolean async) { this.async = async; }
public boolean isUpgraded() { return upgraded; }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
