8271560: sun/security/ssl/DHKeyExchange/LegacyDHEKeyExchange.java sti…

…ll fails due to "An established connection was aborted by the software in your host machine" Reviewed-by: xuelei, rhalade
openjdk · Aug 30, 2021 · f18c0fa · f18c0fa · openjdk-notifier · Aug 30, 2021
1 parent 5aaa20f
commit f18c0fa
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/test/jdk/sun/security/ssl/DHKeyExchange/LegacyDHEKeyExchange.java b/test/jdk/sun/security/ssl/DHKeyExchange/LegacyDHEKeyExchange.java
@@ -32,8 +32,10 @@
  * @run main/othervm -Djdk.tls.ephemeralDHKeySize=legacy LegacyDHEKeyExchange
  */
 
+import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLSocket;
+import java.net.SocketException;
 import java.util.concurrent.CountDownLatch;
 
 public class LegacyDHEKeyExchange extends SSLSocketTemplate{
@@ -53,6 +55,10 @@ protected void runServerApplication(SSLSocket socket) throws Exception {
                 throw she;
             }
             System.out.println("Expected exception thrown in server");
+        } catch (SSLException | SocketException se) {
+            // The client side may have closed the socket.
+            System.out.println("Server exception:");
+            se.printStackTrace(System.out);
         } finally {
             connDoneLatch.countDown();
             connDoneLatch.await();
@@ -75,6 +81,10 @@ protected void runClientApplication(SSLSocket socket) throws Exception {
                 throw she;
             }
             System.out.println("Expected exception thrown in client");
+        } catch (SSLException | SocketException se) {
+            // The server side may have closed the socket.
+            System.out.println("Client exception:");
+            se.printStackTrace(System.out);
         } finally {
             connDoneLatch.countDown();
             connDoneLatch.await();