Author: markt Date: Fri Jun 23 21:02:37 2017 New Revision: 1799701 URL: http://svn.apache.org/viewvc?rev=1799701&view=rev Log: The SSL session ID can be null when OpenSSL is using session tickets. Therefore, remove the check that throws an ISE if the session ID is found to be null.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1799701&r1=1799700&r2=1799701&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Fri Jun 23 21:02:37 2017 @@ -1048,10 +1048,7 @@ public final class OpenSSLEngine extends } id = SSL.getSessionId(ssl); } - if (id == null) { - // The id should never be null, if it was null then the SESSION itself was not valid. - throw new IllegalStateException(sm.getString("engine.noSession")); - } + return id; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org