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 15:25:46 UTC
[tomcat] branch main updated: Replace 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 3a03f46ec0 Replace methods deprecated in Java 16+
3a03f46ec0 is described below
commit 3a03f46ec00a4cadb3bf584308bc675150613a00
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 12 15:25:36 2023 +0000
Replace methods deprecated in Java 16+
---
java/org/apache/catalina/realm/CombinedRealm.java | 2 +-
java/org/apache/catalina/realm/LockOutRealm.java | 2 +-
java/org/apache/catalina/realm/RealmBase.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java b/java/org/apache/catalina/realm/CombinedRealm.java
index eaf46cecd1..0968241e9a 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -320,7 +320,7 @@ public class CombinedRealm extends RealmBase {
Principal authenticatedUser = null;
String username = null;
if (certs != null && certs.length >0) {
- username = certs[0].getSubjectDN().getName();
+ username = certs[0].getSubjectX500Principal().getName();
}
for (Realm realm : realms) {
diff --git a/java/org/apache/catalina/realm/LockOutRealm.java b/java/org/apache/catalina/realm/LockOutRealm.java
index 0743df6d6d..90fe1b64e9 100644
--- a/java/org/apache/catalina/realm/LockOutRealm.java
+++ b/java/org/apache/catalina/realm/LockOutRealm.java
@@ -166,7 +166,7 @@ public class LockOutRealm extends CombinedRealm {
public Principal authenticate(X509Certificate[] certs) {
String username = null;
if (certs != null && certs.length >0) {
- username = certs[0].getSubjectDN().getName();
+ username = certs[0].getSubjectX500Principal().getName();
}
Principal authenticatedUser = super.authenticate(certs);
diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java
index db4226f9e6..3ff9c336e2 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -452,7 +452,7 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
for (X509Certificate cert : certs) {
if (log.isDebugEnabled()) {
log.debug(" Checking validity for '" +
- cert.getSubjectDN().getName() + "'");
+ cert.getSubjectX500Principal().getName() + "'");
}
try {
cert.checkValidity();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org