You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/06/19 17:56:23 UTC
svn commit: r1137382 - in /tomcat/trunk/java/org/apache/coyote:
AbstractProcessor.java ajp/AbstractAjpProcessor.java
http11/AbstractHttp11Processor.java
Author: markt
Date: Sun Jun 19 15:56:22 2011
New Revision: 1137382
URL: http://svn.apache.org/viewvc?rev=1137382&view=rev
Log:
Pull up common code
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.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=1137382&r1=1137381&r2=1137382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Sun Jun 19 15:56:22 2011
@@ -19,6 +19,7 @@ package org.apache.coyote;
import java.util.concurrent.Executor;
import org.apache.tomcat.util.net.AbstractEndpoint;
+import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
/**
* Provides functionality and attributes common to all supported protocols
@@ -82,11 +83,6 @@ public abstract class AbstractProcessor
}
-
- /*
- * Expose selected endpoint attributes through the processor
- */
-
/**
* Obtain the Executor used by the underlying endpoint.
*/
@@ -94,4 +90,14 @@ public abstract class AbstractProcessor
public Executor getExecutor() {
return endpoint.getExecutor();
}
+
+
+ public boolean isAsync() {
+ return asyncStateMachine.isAsync();
+ }
+
+
+ public SocketState asyncPostProcess() {
+ return asyncStateMachine.asyncPostProcess();
+ }
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1137382&r1=1137381&r2=1137382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Sun Jun 19 15:56:22 2011
@@ -871,14 +871,6 @@ public abstract class AbstractAjpProcess
throws IOException;
- protected boolean isAsync() {
- return asyncStateMachine.isAsync();
- }
-
- protected SocketState asyncPostProcess() {
- return asyncStateMachine.asyncPostProcess();
- }
-
// ------------------------------------- InputStreamInputBuffer Inner Class
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1137382&r1=1137381&r2=1137382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Sun Jun 19 15:56:22 2011
@@ -42,7 +42,6 @@ import org.apache.tomcat.util.buf.Messag
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.net.AbstractEndpoint;
-import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.res.StringManager;
public abstract class AbstractHttp11Processor extends AbstractProcessor {
@@ -1023,12 +1022,4 @@ public abstract class AbstractHttp11Proc
}
protected abstract void recycleInternal();
-
- protected boolean isAsync() {
- return asyncStateMachine.isAsync();
- }
-
- protected SocketState asyncPostProcess() {
- return asyncStateMachine.asyncPostProcess();
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org