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/11/20 07:39:02 UTC
[3/3] httpcomponents-core git commit: Refactored output control in
the async HTTP/1.1 protocol handlers
Refactored output control in the async HTTP/1.1 protocol handlers
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/e5bf9468
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/e5bf9468
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/e5bf9468
Branch: refs/heads/master
Commit: e5bf94681ffe765ffcafc7ea06bb68b0f2e83b45
Parents: b6b71d9
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Mon Nov 19 10:28:51 2018 +0100
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Tue Nov 20 08:37:03 2018 +0100
----------------------------------------------------------------------
.../impl/nio/AbstractHttp1StreamDuplexer.java | 24 +++++++++-----------
1 file changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/e5bf9468/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 1ee2333..5b549ba 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
@@ -374,20 +374,18 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
outputLock.unlock();
}
if (connState.compareTo(ConnectionState.SHUTDOWN) < 0) {
- if (isOutputReady()) {
- produceOutput();
- } else {
- final int pendingOutputRequests = outputRequests.get();
- outputLock.lock();
- try {
- if (!outbuf.hasData() && outputRequests.compareAndSet(pendingOutputRequests, 0)) {
- ioSession.clearEvent(SelectionKey.OP_WRITE);
- } else {
- outputRequests.addAndGet(-pendingOutputRequests);
- }
- } finally {
- outputLock.unlock();
+ produceOutput();
+ final int pendingOutputRequests = outputRequests.get();
+ final boolean outputPending = isOutputReady();
+ outputLock.lock();
+ try {
+ if (!outputPending && !outbuf.hasData() && outputRequests.compareAndSet(pendingOutputRequests, 0)) {
+ ioSession.clearEvent(SelectionKey.OP_WRITE);
+ } else {
+ outputRequests.addAndGet(-pendingOutputRequests);
}
+ } finally {
+ outputLock.unlock();
}
outputLock.lock();