From 90e6cda73c08be29fa1fd85d16db9e1f3eaa7abe Mon Sep 17 00:00:00 2001
From: Xuelei Fan <xuelei.fan@oracle.com>
Date: Sun, 9 Oct 2016 14:38:30 +0300
Subject: [PATCH] 8166878: Connection reset during TLS handshake

Reviewed-by: xuelei
---
 .../share/classes/sun/security/ssl/ClientHandshaker.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 1f155a6bf2a..b95de5ecde2 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 @@ final class ClientHandshaker extends Handshaker {
             } 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");