Author: markt
Date: Fri Feb 25 15:58:08 2011
New Revision: 1074597
URL: http://svn.apache.org/viewvc?rev=1074597&view=rev
Log:
Avoid NPEs trying to re-negotiate with NIO
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=1074597&r1=1074596&r2=1074597&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Fri Feb
25 15:58:08 2011
@@ -143,7 +143,7 @@ class JSSESupport implements SSLSupport,
}
if (jsseCerts == null)
jsseCerts = new X509Certificate[0];
- if(jsseCerts.length <= 0 && force) {
+ if(jsseCerts.length <= 0 && force && ssl != null) {
session.invalidate();
handShake();
session = ssl.getSession();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
