From 721e27f6bfc3039e79575ce837e14a3d7a8f58ef Mon Sep 17 00:00:00 2001
From: Antonio Vieiro <avieirov@redhat.com>
Date: Wed, 20 May 2026 05:35:49 -0400
Subject: [PATCH] Backport 18631ef9928fe781ad5a6459642062d5f40d04cb

---
 jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
index 01ac4dffb52..4954e7b4a3a 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -401,8 +401,12 @@ void setStatusResponses(List<byte[]> responses) {
      * maximum lifetime in any case.
      */
     boolean isRejoinable() {
+        // TLS 1.3 can have no session id
+        if (protocolVersion.useTLS13PlusSpec()) {
+            return (!invalidated && isLocalAuthenticationValid());
+        }
         return sessionId != null && sessionId.length() != 0 &&
-            !invalidated && isLocalAuthenticationValid();
+                !invalidated && isLocalAuthenticationValid();
     }
 
     @Override