svn commit: r1854068 - in /tomcat/trunk/java/org/apache/tomcat/util/net/openssl: OpenSSLKeyManager.java OpenSSLUtil.java

[markt]

Author: markt
Date: Thu Feb 21 17:33:52 2019
New Revision: 1854068

URL: http://svn.apache.org/viewvc?rev=1854068&view=rev
Log:
Remove unused code

Removed:
    tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java?rev=1854068&r1=1854067&r2=1854068&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java Thu 
Feb 21 17:33:52 2019
@@ -27,7 +27,6 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.jni.SSL;
 import org.apache.tomcat.util.net.SSLContext;
-import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.apache.tomcat.util.net.SSLUtilBase;
 import org.apache.tomcat.util.net.jsse.JSSEUtil;
@@ -94,12 +93,7 @@ public class OpenSSLUtil extends SSLUtil
         if (jsseUtil != null) {
             return jsseUtil.getKeyManagers();
         } else {
-            // Return something although it is not actually used
-            KeyManager[] managers = {
-                    new 
OpenSSLKeyManager(SSLHostConfig.adjustRelativePath(certificate.getCertificateFile()),
-                            
SSLHostConfig.adjustRelativePath(certificate.getCertificateKeyFile()))
-            };
-            return managers;
+            return null;
         }
     }
 



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