quick fix

line · Jun 17, 2020 · 1c0af1f · 1c0af1f
1 parent 8568631
commit 1c0af1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/main/java/com/linecorp/armeria/client/HttpSessionHandler.java b/core/src/main/java/com/linecorp/armeria/client/HttpSessionHandler.java
@@ -415,7 +415,9 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         if (cause instanceof ProxyConnectException) {
-            setPendingException(ctx, new UnprocessedRequestException(cause));
+            final UnprocessedRequestException wrapped = new UnprocessedRequestException(cause);
+            setPendingException(ctx, wrapped);
+            sessionPromise.tryFailure(wrapped);
             return;
         }
         setPendingException(ctx, new ClosedSessionException(cause));

diff --git a/core/src/test/java/com/linecorp/armeria/client/proxy/ProxyClientIntegrationTest.java b/core/src/test/java/com/linecorp/armeria/client/proxy/ProxyClientIntegrationTest.java
@@ -481,7 +481,7 @@ void testProxy_responseFailure_throwsException() throws Exception {
     }
 
     @Test
-    void testConnectFailedExceptionNotPropagated() throws Exception {
+    void testProxyServerImmediateClose() throws Exception {
         DYNAMIC_HANDLER.setChannelReadCustomizer((ctx, msg) -> {
             ctx.close();
         });