Author: markt
Date: Wed Apr 26 18:37:58 2017
New Revision: 1792791
URL: http://svn.apache.org/viewvc?rev=1792791&view=rev
Log:
Avoid a NullPointerException when reading attributes for a initialised HTTP
connector where TLS is enabled.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1792791&r1=1792790&r2=1792791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed
Apr 26 18:37:58 2017
@@ -562,9 +562,17 @@ public abstract class AbstractHttp11Prot
private SSLHostConfig defaultSSLHostConfig = null;
private void registerDefaultSSLHostConfig() {
if (defaultSSLHostConfig == null) {
- defaultSSLHostConfig = new SSLHostConfig();
- defaultSSLHostConfig.setHostName(getDefaultSSLHostConfigName());
- getEndpoint().addSslHostConfig(defaultSSLHostConfig);
+ for (SSLHostConfig sslHostConfig : findSslHostConfigs()) {
+ if
(getDefaultSSLHostConfigName().equals(sslHostConfig.getHostName())) {
+ defaultSSLHostConfig = sslHostConfig;
+ break;
+ }
+ }
+ if (defaultSSLHostConfig == null) {
+ defaultSSLHostConfig = new SSLHostConfig();
+
defaultSSLHostConfig.setHostName(getDefaultSSLHostConfigName());
+ getEndpoint().addSslHostConfig(defaultSSLHostConfig);
+ }
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1792791&r1=1792790&r2=1792791&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Apr 26 18:37:58 2017
@@ -61,6 +61,10 @@
ensure that that correct encoding (path differs from query string) is
applied and that the encoding is applied consistently. (markt)
</fix>
+ <fix>
+ Avoid a <code>NullPointerException</code> when reading attributes for a
+ initialised HTTP connector where TLS is enabled. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
