[tomcat] branch master updated: Align with 9.0.x

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 4c54a2b  Align with 9.0.x
4c54a2b is described below

commit 4c54a2bf1642b147b7604362d07e6dbdbd3cfc36
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 15 10:11:13 2020 +0100

    Align with 9.0.x
---
 java/org/apache/coyote/UpgradeProtocol.java     | 3 ++-
 java/org/apache/coyote/http2/Http2Protocol.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/coyote/UpgradeProtocol.java 
b/java/org/apache/coyote/UpgradeProtocol.java
index dc840df..bd80e83 100644
--- a/java/org/apache/coyote/UpgradeProtocol.java
+++ b/java/org/apache/coyote/UpgradeProtocol.java
@@ -16,6 +16,7 @@
  */
 package org.apache.coyote;
 
+import org.apache.coyote.http11.AbstractHttp11Protocol;
 import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
@@ -104,7 +105,7 @@ public interface UpgradeProtocol {
      *                 handle any connections passed to this UpgradeProtocol 
via
      *                 the HTTP upgrade mechanism
      */
-    public default void setHttp11Protocol(AbstractProtocol<?> protocol) {
+    public default void setHttp11Protocol(AbstractHttp11Protocol<?> protocol) {
         // NO-OP
     }
 }
diff --git a/java/org/apache/coyote/http2/Http2Protocol.java 
b/java/org/apache/coyote/http2/Http2Protocol.java
index f2a97b5..5c4e5e0 100644
--- a/java/org/apache/coyote/http2/Http2Protocol.java
+++ b/java/org/apache/coyote/http2/Http2Protocol.java
@@ -344,8 +344,8 @@ public class Http2Protocol implements UpgradeProtocol {
 
 
     @Override
-    public void setHttp11Protocol(AbstractProtocol<?> http11Protocol) {
-        this.http11Protocol = (AbstractHttp11Protocol<?>) http11Protocol;
+    public void setHttp11Protocol(AbstractHttp11Protocol<?> http11Protocol) {
+        this.http11Protocol = http11Protocol;
 
         try {
             ObjectName oname = 
this.http11Protocol.getONameForUpgrade(getUpgradeProtocolName());


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