Author: remm
Date: Thu Dec 21 12:06:37 2017
New Revision: 1818919
URL: http://svn.apache.org/viewvc?rev=1818919&view=rev
Log:
61914: Avoid possible NPE on Java 9 when creating a SSL engine. Patch submitted
by Evgenij Ryazanov.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1818919&r1=1818918&r2=1818919&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu
Dec 21 12:06:37 2017
@@ -177,8 +177,9 @@ public abstract class AbstractJsseEndpoi
SSLParameters sslParameters = engine.getSSLParameters();
sslParameters.setUseCipherSuitesOrder(sslHostConfig.getHonorCipherOrder());
- if (JreCompat.isJre9Available() &&
clientRequestedApplicationProtocols.size() > 0 &&
- negotiableProtocols.size() > 0) {
+ if (JreCompat.isJre9Available() && clientRequestedApplicationProtocols
!= null
+ && clientRequestedApplicationProtocols.size() > 0
+ && negotiableProtocols.size() > 0) {
// Only try to negotiate if both client and server have at least
// one protocol in common
// Note: Tomcat does not explicitly negotiate http/1.1
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1818919&r1=1818918&r2=1818919&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec 21 12:06:37 2017
@@ -75,6 +75,10 @@
<bug>61918</bug>: Fix connectionLimitLatch counting when closing an
already closed socket. Based on a patch by Ryan Fong. (remm)
</fix>
+ <fix>
+ <bug>61914</bug>: Possible NPE with Java 9 when creating a SSL engine.
+ Patch submitted by Evgenij Ryazanov. (remm)
+ </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
