[UNDERTOW-1507] Add null checks on HttpClientConnection.ClientReadLis…

…tener#handleEvent() Issue: https://issues.jboss.org/browse/UNDERTOW-1507
undertow-io · Jul 29, 2019 · ca797a8 · ca797a8
1 parent a7477cd
commit ca797a8
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/core/src/main/java/io/undertow/client/http/HttpClientConnection.java b/core/src/main/java/io/undertow/client/http/HttpClientConnection.java
@@ -556,8 +556,10 @@ public void handleEvent(StreamSourceChannel channel) {
                             UndertowLogger.CLIENT_LOGGER.debugf(e, "Connection closed with IOException");
                         }
                         try {
-                            currentRequest.setFailed(e);
-                            currentRequest = null;
+                            if (currentRequest != null) {
+                                currentRequest.setFailed(e);
+                                currentRequest = null;
+                            }
                             pendingResponse = null;
                         } finally {
                             safeClose(channel, HttpClientConnection.this);
@@ -575,8 +577,10 @@ public void handleEvent(StreamSourceChannel channel) {
                         channel.suspendReads();
                         try {
                             // Cancel the current active request
-                            currentRequest.setFailed(new IOException(MESSAGES.connectionClosed()));
-                            currentRequest = null;
+                            if (currentRequest != null) {
+                                currentRequest.setFailed(new IOException(MESSAGES.connectionClosed()));
+                                currentRequest = null;
+                            }
                             pendingResponse = null;
                         } finally {
                             safeClose(HttpClientConnection.this);