8259582: Backout JDK-8237578 until all affected tests have been fixed

Reviewed-by: xuelei

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

@@ -447,8 +447,6 @@ public final class SSLSocketImpl
                     throw conContext.fatal(Alert.HANDSHAKE_FAILURE,
                             "Couldn't kickstart handshaking", iioe);
                 }
-            } catch (SocketException se) {
-                handleException(se);
             } catch (IOException ioe) {
                 throw conContext.fatal(Alert.HANDSHAKE_FAILURE,
                     "Couldn't kickstart handshaking", ioe);
@@ -1413,9 +1411,6 @@ public final class SSLSocketImpl
             } catch (InterruptedIOException iioe) {
                 // don't change exception in case of timeouts or interrupts
                 throw iioe;
-            } catch (SocketException se) {
-                // don't change exception in case of SocketException
-                throw se;
             } catch (IOException ioe) {
                 throw new SSLException("readHandshakeRecord", ioe);
             }
@@ -1481,9 +1476,6 @@ public final class SSLSocketImpl
             } catch (InterruptedIOException iioe) {
                 // don't change exception in case of timeouts or interrupts
                 throw iioe;
-            } catch (SocketException se) {
-                // don't change exception in case of SocketException
-                throw se;
             } catch (IOException ioe) {
                 if (!(ioe instanceof SSLException)) {
                     throw new SSLException("readApplicationRecord", ioe);
@@ -1695,16 +1687,6 @@ public final class SSLSocketImpl
             }
         }
 
-        if (cause instanceof SocketException) {
-            try {
-                conContext.fatal(alert, cause);
-            } catch (Exception e) {
-                // Just delivering the fatal alert, re-throw the socket exception instead.
-            }
-
-            throw (SocketException)cause;
-        }
-
         throw conContext.fatal(alert, cause);
     }
 

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

@@ -28,7 +28,6 @@ package sun.security.ssl;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InterruptedIOException;
-import java.net.SocketException;
 import java.nio.ByteBuffer;
 import javax.crypto.AEADBadTagException;
 import javax.crypto.BadPaddingException;
@@ -141,9 +140,6 @@ interface SSLTransport {
         } catch (InterruptedIOException iioe) {
             // don't close the Socket in case of timeouts or interrupts.
             throw iioe;
-        } catch (SocketException se) {
-            // don't change exception in case of SocketException
-            throw se;
         } catch (IOException ioe) {
             throw context.fatal(Alert.UNEXPECTED_MESSAGE, ioe);
         }

test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java

@@ -131,9 +131,9 @@ public class TrustTrustedCert extends SSLSocketTemplate {
             sslIS.read();
             sslOS.write('A');
             sslOS.flush();
-        } catch (SSLException | SocketException se) {
+        } catch (SSLException ssle) {
             if (!expectFail) {
-                throw se;
+                throw ssle;
             }   // Otherwise, ignore.
         }
     }

test/jdk/sun/security/ssl/SSLSocketImpl/SSLExceptionForIOIssue.java

@@ -31,18 +31,18 @@
  * @bug 8214339
  * @summary SSLSocketImpl erroneously wraps SocketException
  * @library /javax/net/ssl/templates
- * @run main/othervm SocketExceptionForSocketIssues
+ * @run main/othervm SSLExceptionForIOIssue
  */
 
 import javax.net.ssl.*;
 import java.io.*;
 import java.net.*;
 
-public class SocketExceptionForSocketIssues implements SSLContextTemplate {
+public class SSLExceptionForIOIssue implements SSLContextTemplate {
 
     public static void main(String[] args) throws Exception {
         System.err.println("===================================");
-        new SocketExceptionForSocketIssues().test();
+        new SSLExceptionForIOIssue().test();
     }
 
     private void test() throws Exception {
@@ -79,9 +79,9 @@ public class SocketExceptionForSocketIssues implements SSLContextTemplate {
             os.flush();
         } catch (SSLProtocolException | SSLHandshakeException sslhe) {
             throw sslhe;
-        } catch (SocketException se) {
+        } catch (SSLException ssle) {
             // the expected exception, ignore it
-            System.err.println("server exception: " + se);
+            System.err.println("server exception: " + ssle);
         } finally {
             if (listenSocket != null) {
                 listenSocket.close();

test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketShouldThrowSocketException.java

@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2017, 2020, Amazon 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8214339
- * @summary When a SocketException is thrown by the underlying layer, It
- *      should be thrown as is and not be transformed to an SSLException.
- * @library /javax/net/ssl/templates
- * @run main/othervm SSLSocketShouldThrowSocketException
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
-import javax.net.ssl.*;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class SSLSocketShouldThrowSocketException extends SSLSocketTemplate {
-
-    boolean handshake;
-
-    private final CountDownLatch clientTerminatedCondition = new CountDownLatch(1);
-
-    SSLSocketShouldThrowSocketException(boolean handshake) {
-        this.handshake = handshake;
-    }
-
-    @Override
-    protected boolean isCustomizedClientConnection() {
-        return true;
-    }
-
-    @Override
-    protected void runServerApplication(SSLSocket socket) throws Exception {
-        clientTerminatedCondition.await(30L, TimeUnit.SECONDS);
-    }
-
-    @Override
-    protected void runClientApplication(int serverPort) throws Exception {
-        Socket baseSocket = new Socket("localhost", this.serverPort);
-
-        SSLSocketFactory sslsf =
-                (SSLSocketFactory) SSLSocketFactory.getDefault();
-        SSLSocket sslSocket = (SSLSocket)
-                sslsf.createSocket(baseSocket, "localhost", serverPort, false);
-
-        if (this.handshake) {
-            testHandshakeClose(baseSocket, sslSocket);
-        } else {
-            testDataClose(baseSocket, sslSocket);
-        }
-
-        clientTerminatedCondition.countDown();
-
-    }
-
-    private void testHandshakeClose(Socket baseSocket, SSLSocket sslSocket) throws Exception {
-        Thread aborter = new Thread() {
-            @Override
-            public void run() {
-
-                try {
-                    Thread.sleep(10);
-                    System.err.println("Closing the client socket : " + System.nanoTime());
-                    baseSocket.close();
-                } catch (Exception ieo) {
-                    ieo.printStackTrace();
-                }
-            }
-        };
-
-        aborter.start();
-
-        try {
-            // handshaking
-            System.err.println("Client starting handshake: " + System.nanoTime());
-            sslSocket.startHandshake();
-            throw new Exception("Start handshake did not throw an exception");
-        } catch (SocketException se) {
-            System.err.println("Caught Expected SocketException");
-        }
-
-        aborter.join();
-    }
-
-    private void testDataClose(Socket baseSocket, SSLSocket sslSocket) throws Exception{
-
-        CountDownLatch handshakeCondition = new CountDownLatch(1);
-
-        Thread aborter = new Thread() {
-            @Override
-            public void run() {
-
-                try {
-                    handshakeCondition.await(10L, TimeUnit.SECONDS);
-                    System.err.println("Closing the client socket : " + System.nanoTime());
-                    baseSocket.close();
-                } catch (Exception ieo) {
-                    ieo.printStackTrace();
-                }
-            }
-        };
-
-        aborter.start();
-
-        try {
-            // handshaking
-            System.err.println("Client starting handshake: " + System.nanoTime());
-            sslSocket.startHandshake();
-            handshakeCondition.countDown();
-            System.err.println("Reading data from server");
-            BufferedReader is = new BufferedReader(
-                    new InputStreamReader(sslSocket.getInputStream()));
-            String data = is.readLine();
-            throw new Exception("Start handshake did not throw an exception");
-        } catch (SocketException se) {
-            System.err.println("Caught Expected SocketException");
-        }
-
-        aborter.join();
-    }
-
-    public static void main(String[] args) throws Exception {
-        // SocketException should be throws during a handshake phase.
-        (new SSLSocketShouldThrowSocketException(true)).run();
-        // SocketException should be throw during the application data phase.
-        (new SSLSocketShouldThrowSocketException(false)).run();
-    }
-}