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 2025/02/22 16:09:17 UTC
(httpcomponents-core) branch 5.3.x updated: Resource release corrections and code improvements in the base implementations of client / server async exchange handlers
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch 5.3.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
The following commit(s) were added to refs/heads/5.3.x by this push:
new 5aad6bb13 Resource release corrections and code improvements in the base implementations of client / server async exchange handlers
5aad6bb13 is described below
commit 5aad6bb138372c2ed5ffd8d9317cff49dd17c2dd
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sat Feb 22 15:08:59 2025 +0100
Resource release corrections and code improvements in the base implementations of client / server async exchange handlers
---
.../nio/support/AbstractServerExchangeHandler.java | 40 +++++--
.../nio/support/BasicClientExchangeHandler.java | 120 ++++++++++++---------
2 files changed, 102 insertions(+), 58 deletions(-)
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractServerExchangeHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractServerExchangeHandler.java
index da217b052..d33cfc6db 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractServerExchangeHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractServerExchangeHandler.java
@@ -148,21 +148,23 @@ public void completed(final T result) {
.build(),
context);
} catch (final HttpException | IOException ex2) {
- failed(ex2);
+ failedInternal(ex2);
}
} catch (final IOException ex) {
- failed(ex);
+ failedInternal(ex);
+ } finally {
+ releaseRequestConsumer();
}
}
@Override
public void failed(final Exception ex) {
- AbstractServerExchangeHandler.this.failed(ex);
+ failedInternal(ex);
}
@Override
public void cancelled() {
- releaseResources();
+ releaseResourcesInternal();
}
});
@@ -205,30 +207,54 @@ public final void produce(final DataStreamChannel channel) throws IOException {
@Override
public final void failed(final Exception cause) {
+ failedInternal(cause);
+ }
+
+ void failedInternal(final Exception cause) {
try {
final AsyncRequestConsumer<T> requestConsumer = requestConsumerRef.get();
if (requestConsumer != null) {
requestConsumer.failed(cause);
}
+ } finally {
+ releaseRequestConsumer();
+ }
+ try {
final AsyncResponseProducer dataProducer = responseProducerRef.get();
if (dataProducer != null) {
dataProducer.failed(cause);
}
} finally {
- releaseResources();
+ releaseResponseProducer();
}
}
- @Override
- public final void releaseResources() {
+ private void releaseRequestConsumer() {
final AsyncRequestConsumer<T> requestConsumer = requestConsumerRef.getAndSet(null);
if (requestConsumer != null) {
requestConsumer.releaseResources();
}
+ }
+
+ private void releaseResponseProducer() {
final AsyncResponseProducer dataProducer = responseProducerRef.getAndSet(null);
if (dataProducer != null) {
dataProducer.releaseResources();
}
}
+ private void releaseResourcesInternal() {
+ releaseResponseProducer();
+ releaseRequestConsumer();
+ }
+
+ @Override
+ public final void releaseResources() {
+ // Note even though the message exchange has been fully
+ // completed on the transport level, the request
+ // consumer may still be busy post-processing
+ // the request message.
+ releaseResponseProducer();
+ }
+
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicClientExchangeHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicClientExchangeHandler.java
index 467b9d637..0378a98d7 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicClientExchangeHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicClientExchangeHandler.java
@@ -59,8 +59,9 @@ public final class BasicClientExchangeHandler<T> implements AsyncClientExchangeH
private final AsyncRequestProducer requestProducer;
private final AsyncResponseConsumer<T> responseConsumer;
private final AtomicBoolean completed;
- private final FutureCallback<T> resultCallback;
private final AtomicBoolean outputTerminated;
+ private final AtomicBoolean inputTerminated;
+ private final FutureCallback<T> resultCallback;
public BasicClientExchangeHandler(
final AsyncRequestProducer requestProducer,
@@ -71,6 +72,7 @@ public BasicClientExchangeHandler(
this.completed = new AtomicBoolean();
this.resultCallback = resultCallback;
this.outputTerminated = new AtomicBoolean();
+ this.inputTerminated = new AtomicBoolean();
}
@Override
@@ -100,48 +102,23 @@ public void consumeInformation(final HttpResponse response, final HttpContext ht
@Override
public void consumeResponse(final HttpResponse response, final EntityDetails entityDetails, final HttpContext httpContext) throws HttpException, IOException {
if (response.getCode() >= HttpStatus.SC_CLIENT_ERROR) {
- outputTerminated.set(true);
- requestProducer.releaseResources();
+ releaseRequestProducer();
}
responseConsumer.consumeResponse(response, entityDetails, httpContext, new FutureCallback<T>() {
@Override
public void completed(final T result) {
- if (completed.compareAndSet(false, true)) {
- try {
- if (resultCallback != null) {
- resultCallback.completed(result);
- }
- } finally {
- internalReleaseResources();
- }
- }
+ completedInternal(result);
}
@Override
public void failed(final Exception ex) {
- if (completed.compareAndSet(false, true)) {
- try {
- if (resultCallback != null) {
- resultCallback.failed(ex);
- }
- } finally {
- internalReleaseResources();
- }
- }
+ failedInternal(ex);
}
@Override
public void cancelled() {
- if (completed.compareAndSet(false, true)) {
- try {
- if (resultCallback != null) {
- resultCallback.cancelled();
- }
- } finally {
- internalReleaseResources();
- }
- }
+ cancelledInternal();
}
});
@@ -149,15 +126,7 @@ public void cancelled() {
@Override
public void cancel() {
- if (completed.compareAndSet(false, true)) {
- try {
- if (resultCallback != null) {
- resultCallback.cancelled();
- }
- } finally {
- internalReleaseResources();
- }
- }
+ cancelledInternal();
}
@Override
@@ -178,28 +147,77 @@ public void streamEnd(final List<? extends Header> trailers) throws HttpExceptio
@Override
public void failed(final Exception cause) {
try {
- requestProducer.failed(cause);
- responseConsumer.failed(cause);
+ if (inputTerminated.get()) {
+ responseConsumer.failed(cause);
+ }
+ if (!outputTerminated.get()) {
+ requestProducer.failed(cause);
+ }
} finally {
- if (completed.compareAndSet(false, true)) {
- try {
- if (resultCallback != null) {
- resultCallback.failed(cause);
- }
- } finally {
- internalReleaseResources();
+ failedInternal(cause);
+ }
+ }
+
+ private void completedInternal(final T result) {
+ if (completed.compareAndSet(false, true)) {
+ try {
+ if (resultCallback != null) {
+ resultCallback.completed(result);
}
+ } finally {
+ releaseResourcesInternal();
}
}
}
- private void internalReleaseResources() {
- requestProducer.releaseResources();
- responseConsumer.releaseResources();
+ private void failedInternal(final Exception ex) {
+ if (completed.compareAndSet(false, true)) {
+ try {
+ if (resultCallback != null) {
+ resultCallback.failed(ex);
+ }
+ } finally {
+ releaseResourcesInternal();
+ }
+ }
+ }
+
+ private void cancelledInternal() {
+ if (completed.compareAndSet(false, true)) {
+ try {
+ if (resultCallback != null) {
+ resultCallback.cancelled();
+ }
+ } finally {
+ releaseResourcesInternal();
+ }
+ }
+ }
+
+ private void releaseResponseConsumer() {
+ if (inputTerminated.compareAndSet(false, true)) {
+ responseConsumer.releaseResources();
+ }
+ }
+
+ private void releaseRequestProducer() {
+ if (outputTerminated.compareAndSet(false, true)) {
+ requestProducer.releaseResources();
+ }
+ }
+
+ private void releaseResourcesInternal() {
+ releaseRequestProducer();
+ releaseResponseConsumer();
}
@Override
public void releaseResources() {
+ // Note even though the message exchange has been fully
+ // completed on the transport level, the response
+ // consumer may still be busy consuming and digesting
+ // the response message
+ releaseRequestProducer();
}
}