8343411: Test fail on Windows due to "An established connection was aborted by the software in your host machine"

Reviewed-by: dfuchs, jpai

Author: djelinski

test/jdk/java/net/HttpURLConnection/HttpURLConnectionExpect100Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -82,9 +82,9 @@ public void expect100ContinueHitCountTest() throws Exception {
         conn.setRequestProperty("Expect", "100-continue");
         sendRequest(conn);
         getHeaderField(conn);
-        assertEquals(1, server.getServerHitCount());
         // Server rejects the expect 100-continue request with 417 response
         assertEquals(417, conn.getResponseCode());
+        assertEquals(1, server.getServerHitCount());
     }
 
     @Test
@@ -99,12 +99,12 @@ public void defaultRequestHitCountTest() throws Exception {
         conn.setRequestMethod("PUT");
         sendRequest(conn);
         getHeaderField(conn);
-        assertEquals(1, server.getServerHitCount());
         assertEquals(200, conn.getResponseCode());
         try ( InputStream in = conn.getInputStream()) {
             byte[] data = in.readAllBytes();
             assertEquals(RESPONSE.length(), data.length);
         }
+        assertEquals(1, server.getServerHitCount());
     }
 
     private void sendRequest(final HttpURLConnection conn) throws Exception {
@@ -116,6 +116,7 @@ private void sendRequest(final HttpURLConnection conn) throws Exception {
             os.flush();
         } catch (IOException e) {
             // intentional, server will reject the expect 100
+            System.err.println("Got expected exception: " + e);
         }
     }
 
@@ -179,7 +180,7 @@ void close() {
         @Override
         public void run() {
             Socket client;
-            try {
+            try (ss) {
                 while (isRunning) {
                     client = ss.accept();
                     System.out.println(client.getRemoteSocketAddress().toString());
@@ -191,29 +192,16 @@ public void run() {
                 if (isRunning) {
                     throw new RuntimeException(ex);
                 }
-            } finally {
-                if (ss != null && !ss.isClosed()) {
-                    try {
-                        ss.close();
-                    } catch (IOException ex) {
-                        //ignore
-                    }
-                }
             }
         }
 
         private void handleConnection(Socket client) throws IOException {
-            try ( BufferedReader in = new BufferedReader(
+            try (client; BufferedReader in = new BufferedReader(
                 new InputStreamReader(client.getInputStream()));
                 PrintStream out = new PrintStream(client.getOutputStream())) {
                 handle_connection(in, out);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
-            } finally {
-                try {
-                    client.close();
-                } catch (IOException e) {
-                }
             }
         }
 
@@ -230,6 +218,10 @@ private void handle_connection(BufferedReader in, PrintStream out)
             } else {
                 defaultResponse(out);
             }
+            // wait until the client closes the socket
+            while (line != null) {
+                line = in.readLine();
+            }
         }
 
         private void rejectExpect100Continue(PrintStream out) {