Issue #4385 - Minimize impact of deprecated SNI mode on base class

Signed-off-by: Joakim Erdfelt <[email protected]>
jetty · Dec 2, 2019 · e1d64af · e1d64af
1 parent 666ee4e
commit e1d64af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
@@ -1271,7 +1271,7 @@ protected KeyManager[] getKeyManagers(KeyStore keyStore) throws Exception
     protected X509ExtendedKeyManager newSniX509ExtendedKeyManager(X509ExtendedKeyManager keyManager)
     {
         LOG.warn("Using Deprecated SslContextFactory implementation, SNI does not work in this context, use SslContextFactory.Server instead.");
-        return null;
+        return keyManager;
     }
 
     protected TrustManager[] getTrustManagers(KeyStore trustStore, Collection<? extends CRL> crls) throws Exception
@@ -2184,7 +2184,7 @@ protected void checkConfiguration()
         protected X509ExtendedKeyManager newSniX509ExtendedKeyManager(X509ExtendedKeyManager keyManager)
         {
             // Overriding base implementation, as this context should have no WARN message.
-            return null;
+            return keyManager;
         }
     }