Author: markt
Date: Mon Nov 10 16:45:48 2014
New Revision: 1637922
URL: http://svn.apache.org/r1637922
Log:
Remove Endpoint from NioServletInputStream constructor
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
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=1637922&r1=1637921&r2=1637922&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:45:48 2014
@@ -39,7 +39,7 @@ public class Nio2Processor extends Abstr
HttpUpgradeHandler httpUpgradeProcessor,
int asyncWriteBufferSize) {
super(httpUpgradeProcessor,
- new Nio2ServletInputStream(wrapper, endpoint),
+ new Nio2ServletInputStream(wrapper),
new Nio2ServletOutputStream(wrapper, asyncWriteBufferSize,
endpoint));
wrapper.setTimeout(INFINITE_TIMEOUT);
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java?rev=1637922&r1=1637921&r2=1637922&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
Mon Nov 10 16:45:48 2014
@@ -26,7 +26,6 @@ import java.util.concurrent.ExecutionExc
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
import org.apache.tomcat.util.net.SocketStatus;
@@ -34,7 +33,6 @@ import org.apache.tomcat.util.net.Socket
public class Nio2ServletInputStream extends AbstractServletInputStream {
- private final AbstractEndpoint<Nio2Channel> endpoint;
private final SocketWrapperBase<Nio2Channel> wrapper;
private final Nio2Channel channel;
private final CompletionHandler<Integer, SocketWrapperBase<Nio2Channel>>
completionHandler;
@@ -42,8 +40,7 @@ public class Nio2ServletInputStream exte
private volatile boolean readPending = false;
private volatile boolean interest = true;
- public Nio2ServletInputStream(SocketWrapperBase<Nio2Channel> wrapper,
AbstractEndpoint<Nio2Channel> endpoint0) {
- this.endpoint = endpoint0;
+ public Nio2ServletInputStream(SocketWrapperBase<Nio2Channel> wrapper) {
this.wrapper = wrapper;
this.channel = wrapper.getSocket();
this.completionHandler = new CompletionHandler<Integer,
SocketWrapperBase<Nio2Channel>>() {
@@ -62,7 +59,7 @@ public class Nio2ServletInputStream exte
}
}
if (notify) {
- endpoint.processSocket(attachment, SocketStatus.OPEN_READ,
false);
+ wrapper.getEndpoint().processSocket(attachment,
SocketStatus.OPEN_READ, false);
}
}
@Override
@@ -74,7 +71,7 @@ public class Nio2ServletInputStream exte
return;
}
onError(exc);
- endpoint.processSocket(attachment, SocketStatus.ERROR, true);
+ wrapper.getEndpoint().processSocket(attachment,
SocketStatus.ERROR, true);
}
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
