commit 0d3b8574eaf1eecf9e5dee38ca2fa8c84338abb7
author Oleg Kalnichevski <olegk@apache.org> Wed Dec 16 18:00:06 2020 +0100
committer Oleg Kalnichevski <olegk@apache.org> Wed Dec 16 22:10:49 2020 +0100
tree 8c7fd753c2a29a99a13e08f88ae0ed79ec5f47f1
parent 6772a2a64d242816b7cb5846a7dc01304e67f152

Bug fix: fixed broken result callback in ProtocolNegotiatorBase

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ProtocolNegotiatorBase.java

diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ProtocolNegotiatorBase.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ProtocolNegotiatorBase.java
index 20ef57e..d3803b6 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ProtocolNegotiatorBase.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ProtocolNegotiatorBase.java
@@ -72,7 +72,7 @@
         if (data != null && data.hasRemaining()) {
             protocolHandler.inputReady(ioSession, data);
         }
-        if (completed.compareAndSet(true, false)) {
+        if (completed.compareAndSet(false, true) && resultCallback != null) {
             resultCallback.completed(ioSession);
         }
     }
@@ -93,7 +93,7 @@
                 CommandSupport.failCommands(session, cause);
             }
         } catch (final Exception ex) {
-            if (completed.compareAndSet(true, false)) {
+            if (completed.compareAndSet(false, true) && resultCallback != null) {
                 resultCallback.failed(ex);
             }
         }
@@ -109,7 +109,7 @@
                 CommandSupport.cancelCommands(session);
             }
         } finally {
-            if (completed.compareAndSet(true, false)) {
+            if (completed.compareAndSet(false, true) && resultCallback != null) {
                 resultCallback.failed(new ConnectionClosedException());
             }
         }