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 2026/03/23 13:13:46 UTC

(httpcomponents-core) branch 5.4.x updated: Ensure async data consumers can avoid NPE if they have been canceled / released from another thread at the same with concurrent data processing

This is an automated email from the ASF dual-hosted git repository.

olegk pushed a commit to branch 5.4.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git


The following commit(s) were added to refs/heads/5.4.x by this push:
     new 0363ff386 Ensure async data consumers can avoid NPE if they have been canceled / released from another thread at the same with concurrent data processing
0363ff386 is described below

commit 0363ff3866fa4631f3a07bf83a7e8da5653fb514
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Mon Mar 23 14:05:23 2026 +0100

    Ensure async data consumers can avoid NPE if they have been canceled / released from another thread at the same with concurrent data processing
---
 .../nio/support/AbstractAsyncRequesterConsumer.java     | 14 +++++++++++---
 .../http/nio/support/AbstractServerExchangeHandler.java | 17 +++++++++++------
 .../hc/core5/http/nio/support/BasicRequestConsumer.java | 14 +++++++++++---
 .../core5/http/nio/support/BasicResponseConsumer.java   | 14 +++++++++++---
 4 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncRequesterConsumer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncRequesterConsumer.java
index faa050fa1..cf3b510a2 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncRequesterConsumer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncRequesterConsumer.java
@@ -113,19 +113,27 @@ public void completed(final E entity) {
     @Override
     public final void updateCapacity(final CapacityChannel capacityChannel) throws IOException {
         final AsyncEntityConsumer<E> dataConsumer = dataConsumerRef.get();
-        dataConsumer.updateCapacity(capacityChannel);
+        if (dataConsumer != null) {
+            dataConsumer.updateCapacity(capacityChannel);
+        } else {
+            capacityChannel.update(Integer.MAX_VALUE);
+        }
     }
 
     @Override
     public final void consume(final ByteBuffer src) throws IOException {
         final AsyncEntityConsumer<E> dataConsumer = dataConsumerRef.get();
-        dataConsumer.consume(src);
+        if (dataConsumer != null) {
+            dataConsumer.consume(src);
+        }
     }
 
     @Override
     public final void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
         final AsyncEntityConsumer<E> dataConsumer = dataConsumerRef.get();
-        dataConsumer.streamEnd(trailers);
+        if (dataConsumer != null) {
+            dataConsumer.streamEnd(trailers);
+        }
     }
 
     @Override
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 d33cfc6db..8f40ed3b8 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
@@ -174,22 +174,27 @@ public void cancelled() {
     @Override
     public final void updateCapacity(final CapacityChannel capacityChannel) throws IOException {
         final AsyncRequestConsumer<T> requestConsumer = requestConsumerRef.get();
-        Asserts.notNull(requestConsumer, "Data consumer");
-        requestConsumer.updateCapacity(capacityChannel);
+        if (requestConsumer != null) {
+            requestConsumer.updateCapacity(capacityChannel);
+        } else {
+            capacityChannel.update(Integer.MAX_VALUE);
+        }
     }
 
     @Override
     public final void consume(final ByteBuffer src) throws IOException {
         final AsyncRequestConsumer<T> requestConsumer = requestConsumerRef.get();
-        Asserts.notNull(requestConsumer, "Data consumer");
-        requestConsumer.consume(src);
+        if (requestConsumer != null) {
+            requestConsumer.consume(src);
+        }
     }
 
     @Override
     public final void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
         final AsyncRequestConsumer<T> requestConsumer = requestConsumerRef.get();
-        Asserts.notNull(requestConsumer, "Data consumer");
-        requestConsumer.streamEnd(trailers);
+        if (requestConsumer != null) {
+            requestConsumer.streamEnd(trailers);
+        }
     }
 
     @Override
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicRequestConsumer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicRequestConsumer.java
index c1c8e53e5..fb33e6ab3 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicRequestConsumer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicRequestConsumer.java
@@ -100,19 +100,27 @@ public void completed(final T body) {
     @Override
     public void updateCapacity(final CapacityChannel capacityChannel) throws IOException {
         final AsyncEntityConsumer<T> dataConsumer = dataConsumerRef.get();
-        dataConsumer.updateCapacity(capacityChannel);
+        if (dataConsumer != null) {
+            dataConsumer.updateCapacity(capacityChannel);
+        } else {
+            capacityChannel.update(Integer.MAX_VALUE);
+        }
     }
 
     @Override
     public void consume(final ByteBuffer src) throws IOException {
         final AsyncEntityConsumer<T> dataConsumer = dataConsumerRef.get();
-        dataConsumer.consume(src);
+        if (dataConsumer != null) {
+            dataConsumer.consume(src);
+        }
     }
 
     @Override
     public void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
         final AsyncEntityConsumer<T> dataConsumer = dataConsumerRef.get();
-        dataConsumer.streamEnd(trailers);
+        if (dataConsumer != null) {
+            dataConsumer.streamEnd(trailers);
+        }
     }
 
     @Override
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicResponseConsumer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicResponseConsumer.java
index 6b9e67dc6..dbaaac055 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicResponseConsumer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicResponseConsumer.java
@@ -104,19 +104,27 @@ public void informationResponse(final HttpResponse response, final HttpContext h
     @Override
     public void updateCapacity(final CapacityChannel capacityChannel) throws IOException {
         final AsyncEntityConsumer<T> dataConsumer = dataConsumerRef.get();
-        dataConsumer.updateCapacity(capacityChannel);
+        if (dataConsumer != null) {
+            dataConsumer.updateCapacity(capacityChannel);
+        } else {
+            capacityChannel.update(Integer.MAX_VALUE);
+        }
     }
 
     @Override
     public void consume(final ByteBuffer src) throws IOException {
         final AsyncEntityConsumer<T> dataConsumer = dataConsumerRef.get();
-        dataConsumer.consume(src);
+        if (dataConsumer != null) {
+            dataConsumer.consume(src);
+        }
     }
 
     @Override
     public void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
         final AsyncEntityConsumer<T> dataConsumer = dataConsumerRef.get();
-        dataConsumer.streamEnd(trailers);
+        if (dataConsumer != null) {
+            dataConsumer.streamEnd(trailers);
+        }
     }
 
     @Override