Author: markt
Date: Tue Jan 5 22:02:54 2016
New Revision: 1723183
URL: http://svn.apache.org/viewvc?rev=1723183&view=rev
Log:
Quick hack to avoid NPE when running with an APR/native SSL connector and
listing enabled ciphers.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1723183&r1=1723182&r2=1723183&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Tue Jan 5 22:02:54 2016
@@ -18,6 +18,7 @@ package org.apache.tomcat.util.net;
import java.util.HashSet;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.tomcat.util.net.AbstractJsseEndpoint.SSLContextWrapper;
import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
@@ -193,7 +194,13 @@ public class SSLHostConfigCertificate {
public String[] getEnabledCiphers() {
- return getSslContextWrapper().getEnabledCiphers();
+ SSLContextWrapper wrapper = getSslContextWrapper();
+ if (wrapper != null) {
+ return wrapper.getEnabledCiphers();
+ }
+
+ return sslHostConfig.getCipherList().stream().map(c -> c.toString()).
+ collect(Collectors.toList()).toArray(new String[0]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
