hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject [1/4] httpcomponents-core git commit: Moved remote setting ack check in HTTP/2 stream multiplexer output code
Date Wed, 01 Nov 2017 09:19:12 GMT
Repository: httpcomponents-core
Updated Branches:
  refs/heads/master 44adba140 -> b411b2163


Moved remote setting ack check in HTTP/2 stream multiplexer output code


Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/2c80ced2
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/2c80ced2
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/2c80ced2

Branch: refs/heads/master
Commit: 2c80ced25ffb9ad7d0f975e3151387831081e9ea
Parents: 44adba1
Author: Oleg Kalnichevski <olegk@apache.org>
Authored: Tue Oct 31 09:44:40 2017 +0100
Committer: Oleg Kalnichevski <olegk@apache.org>
Committed: Tue Oct 31 09:45:56 2017 +0100

----------------------------------------------------------------------
 .../hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/2c80ced2/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
index a685617..e1044f6 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
@@ -449,9 +449,9 @@ abstract class AbstractHttp2StreamMultiplexer implements Identifiable,
HttpConne
             }
         }
 
-        if (connState.compareTo(ConnectionHandshake.SHUTDOWN) < 0 && remoteSettingState
== SettingsHandshake.ACKED) {
+        if (connState.compareTo(ConnectionHandshake.SHUTDOWN) < 0) {
 
-            if (connOutputWindow.get() > 0) {
+            if (connOutputWindow.get() > 0 && remoteSettingState == SettingsHandshake.ACKED)
{
                 produceOutput();
             }
             final int pendingOutputRequests = outputRequests.get();


Mime
View raw message