[UNDERTOW-2249] At ClientConnection, use ClosedChannelException to notify clientCallback instead of IOException complaining of invalid connection state. At HttpClientTestCase.testSslServerIdentity, enforce that the exception received is ClosedChannelException

Signed-off-by: Flavia Rainone <[email protected]>

Author: fl4via

core/src/main/java/io/undertow/client/ajp/AjpClientConnection.java

@@ -233,10 +233,14 @@ public void addCloseListener(ChannelListener<ClientConnection> listener) {
 
     @Override
     public void sendRequest(final ClientRequest request, final ClientCallback<ClientExchange> clientCallback) {
-        if (anyAreSet(state, UPGRADE_REQUESTED | UPGRADED | CLOSE_REQ | CLOSED)) {
+        if (anyAreSet(state, UPGRADE_REQUESTED | UPGRADED)) {
             clientCallback.failed(UndertowClientMessages.MESSAGES.invalidConnectionState());
             return;
         }
+        if (anyAreSet(state, CLOSE_REQ | CLOSED)) {
+            clientCallback.failed(new ClosedChannelException());
+            return;
+        }
         final AjpClientExchange AjpClientExchange = new AjpClientExchange(clientCallback, request, this);
         if (currentRequest == null) {
             initiateRequest(AjpClientExchange);

core/src/main/java/io/undertow/client/http/HttpClientConnection.java

@@ -348,10 +348,14 @@ public void sendRequest(final ClientRequest request, final ClientCallback<Client
             http2Delegate.sendRequest(request, clientCallback);
             return;
         }
-        if (anyAreSet(state, UPGRADE_REQUESTED | UPGRADED | CLOSE_REQ | CLOSED)) {
+        if (anyAreSet(state, UPGRADE_REQUESTED | UPGRADED)) {
             clientCallback.failed(UndertowClientMessages.MESSAGES.invalidConnectionState());
             return;
         }
+        if (anyAreSet(state, CLOSE_REQ | CLOSED)) {
+            clientCallback.failed(new ClosedChannelException());
+            return;
+        }
         final HttpClientExchange httpClientExchange = new HttpClientExchange(clientCallback, request, this);
         boolean ssl = this.connection instanceof SslConnection;
         if(!ssl && !http2Tried && options.get(UndertowOptions.ENABLE_HTTP2, false) && !request.getRequestHeaders().contains(Headers.UPGRADE)) {

core/src/test/java/io/undertow/client/http/HttpClientTestCase.java

@@ -360,8 +360,7 @@ public void testSslServerIdentity() throws Exception {
             latch.await(10, TimeUnit.SECONDS);
 
             Assert.assertEquals(0, responses.size());
-            // see UNDERTOW-2249: assert exception instanceof ClosedChannelException
-            Assert.assertNotNull(exception);
+            Assert.assertTrue(exception instanceof ClosedChannelException);
         } finally {
             connection.getIoThread().execute(() -> IoUtils.safeClose(connection));
             DefaultServer.stopSSLServer();