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 2018/09/28 16:50:52 UTC
[2/3] httpcomponents-core git commit: Prefer graceful to immediate
close mode
Prefer graceful to immediate close mode
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/5e3bd0ea
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/5e3bd0ea
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/5e3bd0ea
Branch: refs/heads/master
Commit: 5e3bd0ea8e160906eef1c22ba4eef9144fa594b8
Parents: 57dea3d
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Fri Sep 28 18:41:21 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Fri Sep 28 18:46:10 2018 +0200
----------------------------------------------------------------------
.../hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java | 2 +-
.../hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java | 2 +-
.../apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java | 2 +-
.../apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5e3bd0ea/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
index b4fc550..7e926af 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
@@ -158,7 +158,7 @@ public class ClientHttpProtocolNegotiator implements HttpConnectionEventHandler
startHttp2(session);
}
} else {
- session.close(CloseMode.IMMEDIATE);
+ session.close(CloseMode.GRACEFUL);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5e3bd0ea/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java
index 3082b30..1cf1a07 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java
@@ -126,7 +126,7 @@ public class Http2OnlyClientProtocolNegotiator implements HttpConnectionEventHan
if (preface != null) {
writePreface(session);
} else {
- session.close(CloseMode.IMMEDIATE);
+ session.close(CloseMode.GRACEFUL);
}
} catch (final IOException ex) {
session.close(CloseMode.IMMEDIATE);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5e3bd0ea/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
index 436ad3e..2937b8b 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
@@ -288,7 +288,7 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
if (bytesRead == -1 && !inbuf.hasData()) {
if (outputIdle() && inputIdle()) {
- requestShutdown(CloseMode.IMMEDIATE);
+ requestShutdown(CloseMode.GRACEFUL);
} else {
shutdownSession(new ConnectionClosedException("Connection closed by peer"));
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5e3bd0ea/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
index ab97c1a..c652b3e 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
@@ -116,7 +116,7 @@ public class ServerHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
@Override
public void close() {
- ServerHttp1StreamDuplexer.this.close(CloseMode.IMMEDIATE);
+ ServerHttp1StreamDuplexer.this.close(CloseMode.GRACEFUL);
}
@Override