Backport 710653ce1856d13161ae1786d7c5f71997536e78

Author: GoeLin

src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java

@@ -150,14 +150,45 @@ static final class ConnectionAborter {
         private volatile boolean closeRequested;
 
         void connection(HttpConnection connection) {
-            this.connection = connection;
-            if (closeRequested) closeConnection();
+            boolean closeRequested;
+            synchronized (this) {
+                // check whether this new connection should be
+                // closed
+                closeRequested = this.closeRequested;
+                if (!closeRequested) {
+                    this.connection = connection;
+                } else {
+                    // assert this.connection == null
+                    this.closeRequested = false;
+                }
+            }
+            if (closeRequested) closeConnection(connection);
         }
 
         void closeConnection() {
-            closeRequested = true;
-            HttpConnection connection = this.connection;
-            this.connection = null;
+            HttpConnection connection;
+            synchronized (this) {
+                connection = this.connection;
+                if (connection == null) {
+                    closeRequested = true;
+                } else {
+                    this.connection = null;
+                }
+            }
+            closeConnection(connection);
+        }
+
+        HttpConnection disable() {
+            HttpConnection connection;
+            synchronized (this) {
+                connection = this.connection;
+                this.connection = null;
+                this.closeRequested = false;
+            }
+            return connection;
+        }
+
+        private static void closeConnection(HttpConnection connection) {
             if (connection != null) {
                 try {
                     connection.close();
@@ -166,11 +197,6 @@ void closeConnection() {
                 }
             }
         }
-
-        void disable() {
-            connection = null;
-            closeRequested = false;
-        }
     }
 
     // Called for 204 response - when no body is permitted
@@ -614,8 +640,11 @@ HttpResponse.BodySubscriber<T> ignoreBody(HttpResponse.ResponseInfo hdrs) {
                                                  client.client2(),
                                                  this, e::drainLeftOverBytes)
                         .thenCompose((Http2Connection c) -> {
+                            HttpConnection connection = connectionAborter.disable();
                             boolean cached = c.offerConnection();
-                            if (cached) connectionAborter.disable();
+                            if (!cached && connection != null) {
+                                connectionAborter.connection(connection);
+                            }
                             Stream<T> s = c.getInitialStream();
 
                             if (s == null) {

src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java

@@ -28,7 +28,6 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.util.Base64;
@@ -100,7 +99,7 @@ CompletableFuture<Http2Connection> getConnectionFor(HttpRequestImpl req,
             Http2Connection connection = connections.get(key);
             if (connection != null) {
                 try {
-                    if (connection.closed
+                    if (!connection.isOpen()
                             || !connection.reserveStream(true, pushEnabled)) {
                         if (debug.on())
                             debug.log("removing connection from pool since " +
@@ -156,14 +155,19 @@ CompletableFuture<Http2Connection> getConnectionFor(HttpRequestImpl req,
      */
     boolean offerConnection(Http2Connection c) {
         if (debug.on()) debug.log("offering to the connection pool: %s", c);
-        if (c.closed || c.finalStream()) {
+        if (!c.isOpen() || c.finalStream()) {
             if (debug.on())
                 debug.log("skipping offered closed or closing connection: %s", c);
             return false;
         }
 
         String key = c.key();
         synchronized(this) {
+            if (!c.isOpen()) {
+                if (debug.on())
+                    debug.log("skipping offered closed or closing connection: %s", c);
+                return false;
+            }
             Http2Connection c1 = connections.putIfAbsent(key, c);
             if (c1 != null) {
                 if (c.serverPushEnabled() && !c1.serverPushEnabled()) {

src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java

@@ -1073,6 +1073,10 @@ private void handleConnectionFrame(Http2Frame frame)
         }
     }
 
+    boolean isOpen() {
+        return !closed && connection.channel().isOpen();
+    }
+
     void resetStream(int streamid, int code) {
         try {
             if (connection.channel().isOpen()) {

test/jdk/java/net/httpclient/CancelRequestTest.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8245462 8229822
+ * @bug 8245462 8229822 8254786
  * @summary Tests cancelling the request.
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @key randomness