Author: markt
Date: Tue Oct 20 09:02:11 2015
New Revision: 1709549
URL: http://svn.apache.org/viewvc?rev=1709549&view=rev
Log:
Push down some more Processor methods
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/trunk/java/org/apache/coyote/Processor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.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=1709549&r1=1709548&r2=1709549&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Oct 20
09:02:11 2015
@@ -168,8 +168,7 @@ public abstract class AbstractProcessor
/**
* Obtain the Executor used by the underlying endpoint.
*/
- @Override
- public Executor getExecutor() {
+ protected Executor getExecutor() {
return endpoint.getExecutor();
}
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java?rev=1709549&r1=1709548&r2=1709549&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java Tue Oct 20
09:02:11 2015
@@ -97,7 +97,6 @@ public abstract class AbstractProcessorL
}
- @Override
public void addDispatch(DispatchType dispatchType) {
synchronized (dispatches) {
dispatches.add(dispatchType);
@@ -105,7 +104,6 @@ public abstract class AbstractProcessorL
}
- @Override
public Iterator<DispatchType> getIteratorAndClearDispatches() {
// Note: Logic in AbstractProtocol depends on this method only
returning
// a non-null value if the iterator is non-empty. i.e. it should never
@@ -159,5 +157,7 @@ public abstract class AbstractProcessorL
protected abstract SocketState asyncPostProcess();
+ protected abstract void errorDispatch();
+
protected abstract Log getLog();
}
Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1709549&r1=1709548&r2=1709549&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Tue Oct
20 09:02:11 2015
@@ -157,10 +157,10 @@ public class AsyncStateMachine {
private volatile AsyncState state = AsyncState.DISPATCHED;
// Need this to fire listener on complete
private AsyncContextCallback asyncCtxt = null;
- private final Processor processor;
+ private final AbstractProcessor processor;
- public AsyncStateMachine(Processor processor) {
+ public AsyncStateMachine(AbstractProcessor processor) {
this.processor = processor;
}
Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1709549&r1=1709548&r2=1709549&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Tue Oct 20 09:02:11 2015
@@ -18,25 +18,18 @@ package org.apache.coyote;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.concurrent.Executor;
-
import javax.servlet.http.HttpUpgradeHandler;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
-import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapperBase;
-
/**
* Common interface for processors of all protocols.
*/
public interface Processor {
- Executor getExecutor();
-
/**
* Process a connection. This is called whenever an event occurs (e.g. more
* data arrives) that allows processing to continue for a connection that
is
@@ -56,8 +49,6 @@ public interface Processor {
HttpUpgradeHandler getHttpUpgradeHandler();
- void errorDispatch();
-
boolean isAsync();
boolean isUpgrade();
@@ -84,8 +75,4 @@ public interface Processor {
* an existing multiplexed connection.
*/
void pause();
-
- void addDispatch(DispatchType dispatchType);
-
- Iterator<DispatchType> getIteratorAndClearDispatches();
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java?rev=1709549&r1=1709548&r2=1709549&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
Tue Oct 20 09:02:11 2015
@@ -18,8 +18,6 @@ package org.apache.coyote.http11.upgrade
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.concurrent.Executor;
-
import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.WebConnection;
@@ -64,12 +62,6 @@ public abstract class UpgradeProcessorBa
// ---------------------------- Processor methods that are NO-OP for
upgrade
@Override
- public final Executor getExecutor() {
- return null;
- }
-
-
- @Override
public final SocketState service(SocketWrapperBase<?> socketWrapper)
throws IOException {
return null;
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java?rev=1709549&r1=1709548&r2=1709549&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
Tue Oct 20 09:02:11 2015
@@ -22,7 +22,6 @@ import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
import org.apache.coyote.ContainerThreadMarker;
-import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -36,7 +35,7 @@ public class UpgradeServletInputStream e
private static final StringManager sm =
StringManager.getManager(UpgradeServletInputStream.class);
- private final Processor processor;
+ private final UpgradeProcessorBase processor;
private final SocketWrapperBase<?> socketWrapper;
private volatile boolean closed = false;
@@ -47,7 +46,8 @@ public class UpgradeServletInputStream e
private volatile ClassLoader applicationLoader = null;
- public UpgradeServletInputStream(Processor processor, SocketWrapperBase<?>
socketWrapper) {
+ public UpgradeServletInputStream(UpgradeProcessorBase processor,
+ SocketWrapperBase<?> socketWrapper) {
this.processor = processor;
this.socketWrapper = socketWrapper;
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java?rev=1709549&r1=1709548&r2=1709549&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
Tue Oct 20 09:02:11 2015
@@ -22,7 +22,6 @@ import javax.servlet.ServletOutputStream
import javax.servlet.WriteListener;
import org.apache.coyote.ContainerThreadMarker;
-import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -36,7 +35,7 @@ public class UpgradeServletOutputStream
private static final StringManager sm =
StringManager.getManager(UpgradeServletOutputStream.class);
- private final Processor processor;
+ private final UpgradeProcessorBase processor;
private final SocketWrapperBase<?> socketWrapper;
// Used to ensure that isReady() and onWritePossible() have a consistent
@@ -63,7 +62,8 @@ public class UpgradeServletOutputStream
private volatile ClassLoader applicationLoader = null;
- public UpgradeServletOutputStream(Processor processor,
SocketWrapperBase<?> socketWrapper) {
+ public UpgradeServletOutputStream(UpgradeProcessorBase processor,
+ SocketWrapperBase<?> socketWrapper) {
this.processor = processor;
this.socketWrapper = socketWrapper;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
