Author: markt
Date: Mon Apr 3 12:48:08 2017
New Revision: 1789984
URL: http://svn.apache.org/viewvc?rev=1789984&view=rev
Log:
Avoid a NullPointerException when reading attributes for a running HTTP
connector where TLS is not enabled.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1789984&r1=1789983&r2=1789984&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Apr
3 12:48:08 2017
@@ -188,7 +188,7 @@ public abstract class AbstractEndpoint<S
throw new
IllegalArgumentException(sm.getString("endpoint.noSslHostName"));
}
sslHostConfig.setConfigType(getSslConfigType());
- if (bindState != BindState.UNBOUND) {
+ if (bindState != BindState.UNBOUND && isSSLEnabled()) {
try {
createSSLContext(sslHostConfig);
} catch (Exception e) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1789984&r1=1789983&r2=1789984&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr 3 12:48:08 2017
@@ -60,6 +60,10 @@
Correct a regression in the X to comma refactoring that broke JMX
operations that take parameters. (markt)
</fix>
+ <fix>
+ Avoid a <code>NullPointerException</code> when reading attributes for a
+ running HTTP connector where TLS is not 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
