[tomcat] 02/02: Backport deprecation

[markt]

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

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

commit f14610e7237db303ca9bdffe3371f8a80d83aa72
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 24 13:06:02 2021 +0100

    Backport deprecation
---
 java/org/apache/coyote/AbstractProtocol.java     | 2 ++
 java/org/apache/tomcat/util/net/AprEndpoint.java | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index c8b4a94..c7042e1 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -787,6 +787,7 @@ public abstract class AbstractProtocol<S> implements 
ProtocolHandler,
         }
 
 
+        @SuppressWarnings("deprecation")
         @Override
         public SocketState process(SocketWrapperBase<S> wrapper, SocketEvent 
status) {
             if (getLog().isDebugEnabled()) {
@@ -882,6 +883,7 @@ public abstract class AbstractProtocol<S> implements 
ProtocolHandler,
                     }
                 }
 
+                // Can switch to non-deprecated version in Tomcat 10.1.x
                 processor.setSslSupport(
                         
wrapper.getSslSupport(getProtocol().getClientCertProvider()));
 
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 3c2f68a..9cdf9de 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2574,6 +2574,12 @@ public class AprEndpoint extends 
AbstractEndpoint<Long,Long> implements SNICallB
 
 
         @Override
+        public SSLSupport getSslSupport() {
+            throw new UnsupportedOperationException();
+        }
+
+
+        @Override
         public void doClientAuth(SSLSupport sslSupport) throws IOException {
             long socket = getSocket().longValue();
             // Configure connection to require a certificate. This requires a

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