This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 96c8eea53f Fix SSL socket factory configuration in the JNDI realm
96c8eea53f is described below
commit 96c8eea53fad2a9275e6fcb200de44e8c4aece54
Author: remm <[email protected]>
AuthorDate: Mon Nov 3 10:08:12 2025 +0100
Fix SSL socket factory configuration in the JNDI realm
Based on PR#915 by Joshua Rogers.
---
java/org/apache/catalina/realm/JNDIRealm.java | 4 ++--
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index 9849144418..57b9afa53a 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -2563,8 +2563,8 @@ public class JNDIRealm extends RealmBase {
private SSLSocketFactory createSSLSocketFactoryFromClassName(String
className) {
try {
Object o = constructInstance(className);
- if (o instanceof SSLSocketFactory) {
- return sslSocketFactory;
+ if (o instanceof SSLSocketFactory socketFactory) {
+ return socketFactory;
} else {
throw new
IllegalArgumentException(sm.getString("jndiRealm.invalidSslSocketFactory",
className));
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7a44121ed3..ef3274ef54 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
individual class path components to avoid a potential
<code>NullPointerException</code>. Identified by Coverity Scan. (markt)
</fix>
+ <fix>
+ Fix SSL socket factory configuration in the JNDI realm. Based on pull
+ request <pr>915</pr> by Joshua Rogers. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
