commit 90e6cda73c08be29fa1fd85d16db9e1f3eaa7abe
author Xuelei Fan <xuelei.fan@oracle.com> Sun Oct 09 14:38:30 2016 +0300
committer Ivan Gerasimov <igerasim@openjdk.org> Sun Oct 09 14:38:30 2016 +0300
tree 657a8c5ede3c496d760d0d8ee9f866db90068455
parent 698c52a1eb615d409963efae884a16f6408eea16

8166878: Connection reset during TLS handshake

Reviewed-by: xuelei

jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java

diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
index 1f155a6..b95de5e 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
@@ -673,8 +673,11 @@
             } else {
                 // we wanted to resume, but the server refused
                 //
-                // Invalidate the session in case of reusing next time.
-                session.invalidate();
+                // Invalidate the session for initial handshake in case
+                // of reusing next time.
+                if (isInitialHandshake) {
+                    session.invalidate();
+                }
                 session = null;
                 if (!enableNewSession) {
                     throw new SSLException("New session creation is disabled");