From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 25 Feb 2011 15:58:08 +0000 (+0000)
Subject: Avoid NPEs trying to re-negotiate with NIO
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d07de01a880d4a4085ff21020664201894f0f444;p=tomcat7.0

Avoid NPEs trying to re-negotiate with NIO

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1074597 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
index b243cd539..757b7b880 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
@@ -143,7 +143,7 @@ class JSSESupport implements SSLSupport, SSLSessionManager {
         }
         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();