8370656: Re-examine use of InterruptedIOException in sun.security.ssl code

src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,13 +28,13 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.SocketException;
+import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -77,10 +77,10 @@ public final class SSLSocketImpl
     /**
      * ERROR HANDLING GUIDELINES
      * (which exceptions to throw and catch and which not to throw and catch)
-     *
+     * <p>
      * - if there is an IOException (SocketException) when accessing the
      *   underlying Socket, pass it through
-     *
+     * <p>
      * - do not throw IOExceptions, throw SSLExceptions (or a subclass)
      */
 
@@ -454,12 +454,12 @@ private void startHandshake(boolean resumable) throws IOException {
                 if (!conContext.isNegotiated) {
                     readHandshakeRecord();
                 }
-            } catch (InterruptedIOException iioe) {
+            } catch (SocketTimeoutException e) {
                 if(resumable){
-                    handleException(iioe);
+                    handleException(e);
                 } else{
                     throw conContext.fatal(Alert.HANDSHAKE_FAILURE,
-                            "Couldn't kickstart handshaking", iioe);
+                            "Couldn't kickstart handshaking", e);
                 }
             } catch (SocketException se) {
                 handleException(se);
@@ -1427,7 +1427,7 @@ private int readHandshakeRecord() throws IOException {
                     return 0;
                 }
             } catch (SSLException |
-                    InterruptedIOException | SocketException se) {
+                     SocketTimeoutException | SocketException se) {
                 // Don't change exception in case of timeouts or interrupts
                 // or SocketException.
                 throw se;
@@ -1486,7 +1486,7 @@ private ByteBuffer readApplicationRecord(
                     return buffer;
                 }
             } catch (SSLException |
-                    InterruptedIOException | SocketException se) {
+                     SocketTimeoutException | SocketException se) {
                 // Don't change exception in case of timeouts or interrupts
                 // or SocketException.
                 throw se;
@@ -1677,37 +1677,25 @@ private void handleException(Exception cause) throws IOException {
             SSLLogger.warning("handling exception", cause);
         }
 
-        // Don't close the Socket in case of timeouts or interrupts.
-        if (cause instanceof InterruptedIOException) {
-            throw (IOException)cause;
-        }
-
-        // need to perform error shutdown
-        boolean isSSLException = (cause instanceof SSLException);
         Alert alert;
-        if (isSSLException) {
-            if (cause instanceof SSLHandshakeException) {
-                alert = Alert.HANDSHAKE_FAILURE;
-            } else {
-                alert = Alert.UNEXPECTED_MESSAGE;
-            }
-        } else {
-            if (cause instanceof IOException) {
-                alert = Alert.UNEXPECTED_MESSAGE;
-            } else {
-                // RuntimeException
-                alert = Alert.INTERNAL_ERROR;
-            }
+
+        switch (cause) {
+            // Don't close the Socket in case of timeouts.
+            case SocketTimeoutException ste -> throw ste;
+            // Set alert type based on exception type.
+            case SSLHandshakeException _ -> alert = Alert.HANDSHAKE_FAILURE;
+            case IOException _ -> alert = Alert.UNEXPECTED_MESSAGE;
+            default -> alert = Alert.INTERNAL_ERROR;
         }
 
-        if (cause instanceof SocketException) {
+        if (cause instanceof SocketException se) {
             try {
-                throw conContext.fatal(alert, cause);
+                throw conContext.fatal(alert, se);
             } catch (Exception e) {
                 // Just delivering the fatal alert, re-throw the socket exception instead.
             }
 
-            throw (SocketException)cause;
+            throw se;
         }
 
         throw conContext.fatal(alert, cause);

src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,10 +27,10 @@
 package sun.security.ssl;
 
 import java.io.EOFException;
-import java.io.InterruptedIOException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
@@ -180,7 +180,7 @@ Plaintext[] decode(ByteBuffer[] srcs, int srcsOffset,
             if (plaintext == null) {
                 plaintext = decodeInputRecord();
             }
-        } catch(InterruptedIOException e) {
+        } catch (SocketTimeoutException e) {
             // do not clean header and recordBody in case of Socket Timeout
             cleanInBuffer = false;
             throw e;

src/java.base/share/classes/sun/security/ssl/SSLTransport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
 
 import java.io.EOFException;
 import java.io.IOException;
-import java.io.InterruptedIOException;
 import java.net.SocketException;
+import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import javax.crypto.AEADBadTagException;
 import javax.crypto.BadPaddingException;
@@ -138,7 +138,7 @@ static Plaintext decode(TransportContext context,
         } catch (EOFException eofe) {
             // rethrow EOFException, the call will handle it if needed.
             throw eofe;
-        } catch (InterruptedIOException | SocketException se) {
+        } catch (SocketTimeoutException | SocketException se) {
             // don't close the Socket in case of timeouts or interrupts or SocketException.
             throw se;
         } catch (IOException ioe) {