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 2023/01/12 16:40:48 UTC

[tomcat] branch main updated: Fix calls to methods deprecated in Java 16+

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 4b6ccc2f6e Fix calls to methods deprecated in Java 16+
4b6ccc2f6e is described below

commit 4b6ccc2f6e7b8e6f52aabd73c491e4e9d1679efb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 12 16:40:41 2023 +0000

    Fix calls to methods deprecated in Java 16+
---
 java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 8e925dcff3..a023c0d1e9 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -233,7 +233,7 @@ public class ResolverImpl extends Resolver {
         } else if (key.equals("M_SERIAL")) {
             return certificates[0].getSerialNumber().toString();
         } else if (key.equals("S_DN")) {
-            return certificates[0].getSubjectDN().getName();
+            return certificates[0].getSubjectX500Principal().getName();
         } else if (key.startsWith("S_DN_")) {
             key = key.substring("S_DN_".length());
             return resolveComponent(certificates[0].getSubjectX500Principal().getName(), key);
@@ -246,7 +246,7 @@ public class ResolverImpl extends Resolver {
             key = key.substring("SAN_DNS_".length());
             return resolveAlternateName(certificates[0], 2, Integer.parseInt(key));
         } else if (key.equals("I_DN")) {
-            return certificates[0].getIssuerDN().getName();
+            return certificates[0].getIssuerX500Principal().getName();
         } else if (key.startsWith("I_DN_")) {
             key = key.substring("I_DN_".length());
             return resolveComponent(certificates[0].getIssuerX500Principal().getName(), key);


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