Close after goaway

danielkec · Nov 21, 2023 · 87d2a2c · 87d2a2c
1 parent 09d6d72
commit 87d2a2c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/webclient/http2/src/main/java/io/helidon/webclient/http2/Http2ClientConnection.java b/webclient/http2/src/main/java/io/helidon/webclient/http2/Http2ClientConnection.java
@@ -203,8 +203,8 @@ void updateLastStreamId(int lastStreamId) {
     }
 
     void close() {
+        this.goAway(0, Http2ErrorCode.NO_ERROR, "Closing connection");
         if (state.getAndSet(State.CLOSED) != State.CLOSED) {
-            this.goAway(0, Http2ErrorCode.NO_ERROR, "Closing connection");
             try {
                 handleTask.cancel(true);
                 ctx.log(LOGGER, TRACE, "Closing connection");

diff --git a/webclient/http2/src/main/java/io/helidon/webclient/http2/Http2ConnectionCache.java b/webclient/http2/src/main/java/io/helidon/webclient/http2/Http2ConnectionCache.java
@@ -46,7 +46,7 @@ static Http2ConnectionCache create() {
 
     @Override
     public void closeResource() {
-        if (closed.getAndSet(true)) {
+        if (!closed.getAndSet(true)) {
             List.copyOf(cache.keySet())
                     .forEach(this::closeAndRemove);
         }