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 2020/03/07 10:12:12 UTC
[httpcomponents-client] 03/03: Fix NPE for null HttpContext in
minimal async clients
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit ffa0530bb2fb017e140e1be98754a6e1d25b905e
Author: slisaasquatch <sl...@saasquat.ch>
AuthorDate: Fri Mar 6 11:31:42 2020 -0800
Fix NPE for null HttpContext in minimal async clients
---
.../org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java | 2 +-
.../org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java
index bd4a35d..dc23b62 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java
@@ -136,7 +136,7 @@ public final class MinimalH2AsyncClient extends AbstractMinimalHttpAsyncClientBa
final HttpContext context) {
ensureRunning();
final ComplexCancellable cancellable = new ComplexCancellable();
- final HttpClientContext clientContext = HttpClientContext.adapt(context);
+ final HttpClientContext clientContext = context != null ? HttpClientContext.adapt(context) : HttpClientContext.create();
try {
exchangeHandler.produceRequest(new RequestChannel() {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java
index 65af820..d4e95d2 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java
@@ -248,7 +248,7 @@ public final class MinimalHttpAsyncClient extends AbstractMinimalHttpAsyncClient
final HttpContext context) {
ensureRunning();
final ComplexCancellable cancellable = new ComplexCancellable();
- final HttpClientContext clientContext = HttpClientContext.adapt(context);
+ final HttpClientContext clientContext = context != null ? HttpClientContext.adapt(context) : HttpClientContext.create();
try {
exchangeHandler.produceRequest(new RequestChannel() {