Author: markt
Date: Wed Dec 14 11:06:54 2016
New Revision: 1774191
URL: http://svn.apache.org/viewvc?rev=1774191&view=rev
Log:
Remove references to AbstractEndpoint from AbstractProcessor
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1774191&r1=1774190&r2=1774191&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Wed Dec 14
11:06:54 2016
@@ -27,7 +27,6 @@ import javax.servlet.RequestDispatcher;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SSLSupport;
@@ -60,13 +59,13 @@ public abstract class AbstractProcessor
public AbstractProcessor(AbstractProtocol<?> protocol) {
- this(protocol.getEndpoint(), new Request(), new Response());
+ this(protocol.getExecutor(), new Request(), new Response());
}
- protected AbstractProcessor(AbstractEndpoint<?,?> endpoint, Request
coyoteRequest,
+ protected AbstractProcessor(Executor executor, Request coyoteRequest,
Response coyoteResponse) {
- this.executor = endpoint.getExecutor();
+ this.executor = executor;
asyncStateMachine = new AsyncStateMachine(this);
request = coyoteRequest;
response = coyoteResponse;
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1774191&r1=1774190&r2=1774191&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Wed Dec 14
11:06:54 2016
@@ -45,7 +45,8 @@ class StreamProcessor extends AbstractPr
StreamProcessor(Http2UpgradeHandler handler, Stream stream, Adapter
adapter,
SocketWrapperBase<?> socketWrapper) {
- super(socketWrapper.getEndpoint(), stream.getCoyoteRequest(),
stream.getCoyoteResponse());
+ super(socketWrapper.getEndpoint().getExecutor(),
stream.getCoyoteRequest(),
+ stream.getCoyoteResponse());
this.handler = handler;
this.stream = stream;
setAdapter(adapter);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
