Author: markt
Date: Fri Aug 12 07:48:09 2016
New Revision: 1756113
URL: http://svn.apache.org/viewvc?rev=1756113&view=rev
Log:
Provide a default implementation to reduce duplication
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1756113&r1=1756112&r2=1756113&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Fri Aug 12
07:48:09 2016
@@ -667,7 +667,20 @@ public abstract class AbstractProcessor
}
- protected abstract void doPush(PushToken pushToken);
+ /**
+ * Process a push. Processors that support push should override this method
+ * and process the provided token.
+ *
+ * @param pushToken Contains all the information necessary for the
Processor
+ * to process the push request
+ *
+ * @throws UnsupportedOperationException if the protocol does not support
+ * push
+ */
+ protected void doPush(PushToken pushToken) {
+ throw new UnsupportedOperationException(
+ sm.getString("abstractProcessor.pushrequest.notsupported"));
+ }
/**
Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1756113&r1=1756112&r2=1756113&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties Fri Aug 12
07:48:09 2016
@@ -20,6 +20,7 @@ abstractConnectionHandler.socketexceptio
abstractConnectionHandler.negotiatedProcessor.fail=Failed to create Processor
for negotiated protocol [{0}]
abstractProcessor.nonContainerThreadError=An error occurred in processing
while on a non-container thread. The connection will be closed immediately
+abstractProcessor.pushrequest.notsupported=Server push requests are not
supported by this protocol
abstractProcessor.socket.ssl=Exception getting SSL attributes
abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named
[{0}] from MBean server [{1}]
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1756113&r1=1756112&r2=1756113&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Aug 12
07:48:09 2016
@@ -33,7 +33,6 @@ import org.apache.coyote.ActionCode;
import org.apache.coyote.ErrorState;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.OutputBuffer;
-import org.apache.coyote.PushToken;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.UpgradeToken;
import org.apache.juli.logging.Log;
@@ -1304,17 +1303,6 @@ public class AjpProcessor extends Abstra
}
- /**
- * @param pushToken Unused
- */
- @Override
- protected final void doPush(PushToken pushToken) {
- // HTTP2 connections only. Unsupported for AJP.
- throw new UnsupportedOperationException(
- sm.getString("ajpprocessor.pushrequest.notsupported"));
- }
-
-
/**
* Read at least the specified amount of bytes, and place them
* in the input buffer. Note that if any data is available to read then
this
Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1756113&r1=1756112&r2=1756113&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Fri Aug 12
07:48:09 2016
@@ -28,7 +28,6 @@ ajpprocessor.request.prepare=Error prepa
ajpprocessor.request.process=Error processing request
ajpprocessor.certs.fail=Certificate conversion failed
ajpprocessor.httpupgrade.notsupported=HTTP upgrade is not supported by the AJP
protocol
-ajpprocessor.pushrequest.notsupported=Server push requests are not supported
by the AJP protocol
ajpmessage.null=Cannot append null value
ajpmessage.overflow=Overflow error for buffer adding {0} bytes at position {1}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1756113&r1=1756112&r2=1756113&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Aug 12
07:48:09 2016
@@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletRes
import org.apache.coyote.AbstractProcessor;
import org.apache.coyote.ActionCode;
import org.apache.coyote.ErrorState;
-import org.apache.coyote.PushToken;
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.UpgradeProtocol;
@@ -1592,14 +1591,6 @@ public class Http11Processor extends Abs
}
- @Override
- protected final void doPush(PushToken pushToken) {
- // HTTP2 connections only. Unsupported for AJP.
- throw new UnsupportedOperationException(
- sm.getString("http11processor.pushrequest.notsupported"));
- }
-
-
/**
* Checks to see if the keep-alive loop should be broken, performing any
* processing (e.g. sendfile handling) that may have an impact on whether
Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1756113&r1=1756112&r2=1756113&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties Fri Aug
12 07:48:09 2016
@@ -20,7 +20,6 @@ abstractHttp11Protocol.httpUpgradeConfig
http11processor.fallToDebug=\n Note: further occurrences of HTTP header
parsing errors will be logged at DEBUG level.
http11processor.header.parse=Error parsing HTTP request header
http11processor.neverused=This method should never be used
-http11processor.pushrequest.notsupported=Server push requests are not
supported by the HTTP/1.1 protocol
http11processor.request.prepare=Error preparing request
http11processor.request.process=Error processing request
http11processor.request.finish=Error finishing request
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
