Fix build and test

Author: GoeLin

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

@@ -46,6 +46,8 @@
 import java.util.concurrent.Flow.Subscription;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.BiPredicate;
 import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
@@ -431,13 +433,10 @@ private void receiveDataFrame(DataFrame df) {
     // is OK.
     private void pushDataFrame(int len, DataFrame df) {
         boolean closed = false;
-        stateLock.lock();
-        try {
+        synchronized(this) {
             if (!(closed = this.closed)) {
                 inputQ.add(df);
             }
-        } finally {
-            stateLock.unlock();
         }
         if (closed && len > 0) connection.releaseUnconsumed(df);
     }

test/jdk/java/net/httpclient/http2/StreamFlowControlTest.java

@@ -41,6 +41,7 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.charset.StandardCharsets;
@@ -296,10 +297,14 @@ public void setup() throws Exception {
         this.https2TestServer.start();
 
         // warmup to eliminate delay due to SSL class loading and initialization.
-        try (var client = HttpClient.newBuilder().sslContext(sslContext).build()) {
-            var request = HttpRequest.newBuilder(URI.create(h2Head)).HEAD().build();
+        HttpClient client = HttpClient.newBuilder().executor(Executors.newCachedThreadPool()).sslContext(sslContext).build();
+        try {
+            var request = HttpRequest.newBuilder(URI.create(h2Head)).method("HEAD", BodyPublishers.noBody()).build();
             var resp = client.send(request, BodyHandlers.discarding());
             assertEquals(resp.statusCode(), 200);
+        } finally {
+            ExecutorService exec = (ExecutorService)client.executor().get();
+            exec.shutdownNow();
         }
     }