You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2016/12/09 16:47:56 UTC
svn commit: r1773435 -
/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
Author: olegk
Date: Fri Dec 9 16:47:56 2016
New Revision: 1773435
URL: http://svn.apache.org/viewvc?rev=1773435&view=rev
Log:
Do not execute requests until the remote endpoints acknowledges receipt of protocol settings
Modified:
httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java?rev=1773435&r1=1773434&r2=1773435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java Fri Dec 9 16:47:56 2016
@@ -462,7 +462,7 @@ abstract class AbstractHttp2StreamMultip
}
}
- if (connState == ConnectionHandshake.ACTIVE) {
+ if (connState == ConnectionHandshake.ACTIVE && remoteSettingState == SettingsHandshake.ACKED) {
processPendingCommands();
} else if (connState == ConnectionHandshake.SHUTDOWN) {
outputLock.lock();
@@ -1085,7 +1085,7 @@ abstract class AbstractHttp2StreamMultip
@Override
public void shutdown() throws IOException {
- ioSession.addFirst(new ShutdownCommand(ShutdownType.IMMEDIATE));
+ ioSession.shutdown();
}
@Override