commit f84ad5d64e34eec5b26e243a73b4e3faa735130e
author remm <remm@apache.org> Thu Jan 28 13:14:14 2021 +0100
committer remm <remm@apache.org> Thu Jan 28 13:15:41 2021 +0100
tree f4c604a6315c0573fb9495d630a2e2b74e79d086
parent 48f2d41c931a0684aa169e8c6f727f55298244bd

Fix NPE

java/org/apache/tomcat/jni/SSLContext.java

diff --git a/java/org/apache/tomcat/jni/SSLContext.java b/java/org/apache/tomcat/jni/SSLContext.java
index 8c2f9b9..1810571 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -419,7 +419,8 @@
         }
         // Can't be sure OpenSSL is going to provide the SNI value in lower case
         // so convert it before looking up the SSLContext
-        return sniCallBack.getSslContext(sniHostName.toLowerCase(Locale.ENGLISH));
+        String hostName = (sniHostName == null) ? null : sniHostName.toLowerCase(Locale.ENGLISH);
+        return sniCallBack.getSslContext(hostName);
     }
 
     /**