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 2016/08/12 07:47:49 UTC

svn commit: r1756109 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java ajp/AjpProcessor.java http11/Http11Processor.java

Author: markt
Date: Fri Aug 12 07:47:48 2016
New Revision: 1756109

URL: http://svn.apache.org/viewvc?rev=1756109&view=rev
Log:
Provide default implementation to reduce duplication

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.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=1756109&r1=1756108&r2=1756109&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Fri Aug 12 07:47:48 2016
@@ -613,7 +613,16 @@ public abstract class AbstractProcessor
     protected abstract void doHttpUpgrade(UpgradeToken upgradeToken);
 
 
-    protected abstract boolean isPushSupported();
+    /**
+     * Protocols that support push should override this method and return {@code
+     * true}.
+     *
+     * @return {@code true} if push is supported by this processor, otherwise
+     *         {@code false}.
+     */
+    protected boolean isPushSupported() {
+        return false;
+    }
 
 
     protected abstract void doPush(PushToken pushToken);

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=1756109&r1=1756108&r2=1756109&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:47:48 2016
@@ -1304,13 +1304,6 @@ public class AjpProcessor extends Abstra
     }
 
 
-    @Override
-    protected final boolean isPushSupported() {
-        // HTTP2 connections only. Unsupported for AJP.
-        return false;
-    }
-
-
     /**
      * @param pushToken Unused
      */

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=1756109&r1=1756108&r2=1756109&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:47:48 2016
@@ -1633,13 +1633,6 @@ public class Http11Processor extends Abs
 
 
     @Override
-    protected final boolean isPushSupported() {
-        // HTTP2 connections only. Unsupported for HTTP/1.x
-        return false;
-    }
-
-
-    @Override
     protected final void doPush(PushToken pushToken) {
         // HTTP2 connections only. Unsupported for AJP.
         throw new UnsupportedOperationException(



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org