Author: remm
Date: Sun Jan 24 17:27:52 2016
New Revision: 1726515
URL: http://svn.apache.org/viewvc?rev=1726515&view=rev
Log:
Avoid NPE on bind for APR when using SSL.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1726515&r1=1726514&r2=1726515&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sun Jan 24
17:27:52 2016
@@ -363,7 +363,7 @@ public class AprEndpoint extends Abstrac
// Native fallback used if protocols=""
value = SSL.SSL_PROTOCOL_ALL;
} else {
- for (String protocol :
sslHostConfig.getEnabledProtocols()) {
+ for (String protocol : sslHostConfig.getProtocols()) {
if
(Constants.SSL_PROTO_SSLv2Hello.equalsIgnoreCase(protocol)) {
// NO-OP. OpenSSL always supports SSLv2Hello
} else if
(Constants.SSL_PROTO_SSLv2.equalsIgnoreCase(protocol)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
