[SDCISA-16207] Respond failure immediately in place of waiting for a …

…timeout. Related: SDCISA-15633, SDCISA-15833, SDCISA-16147, SDCISA-16293, SDCISA-16207, SDCISA-16197, SDCISA-16194, SDCISA-16204,swisspost/vertx-redisques#170, swisspost/vertx-redisques#177, swisspost/vertx-rest-storage#186, swisspost#577, swisspost/vertx-redisques#181, swisspost#493, swisspost/vertx-rest-storage#188, swisspost#583, swisspost#584, swisspost/vertx-redisques#186, swisspost#593
hiddenalpha · Jun 17, 2024 · b32ac56 · b32ac56
1 parent 4d4f62a
commit b32ac56
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/gateleen-routing/src/main/java/org/swisspush/gateleen/routing/Forwarder.java b/gateleen-routing/src/main/java/org/swisspush/gateleen/routing/Forwarder.java
@@ -503,7 +503,7 @@ private Handler<AsyncResult<HttpClientResponse>> getAsyncHttpClientResponseHandl
 
             final LoggingWriteStream loggingWriteStream = new LoggingWriteStream(req.response(), loggingHandler, false);
             final Pump pump = Pump.pump(cRes, loggingWriteStream);
-            cRes.endHandler(v -> {
+            Handler<Void> cResEndHandler = v -> {
                 try {
                     req.response().end();
 
@@ -516,7 +516,14 @@ private Handler<AsyncResult<HttpClientResponse>> getAsyncHttpClientResponseHandl
                     // ignore because maybe already closed
                 }
                 vertx.runOnContext(event -> loggingHandler.log());
-            });
+            };
+            try {
+                cRes.endHandler(cResEndHandler);
+            } catch (IllegalStateException ex) {
+                log.warn("cRes.endHandler() failed", ex);
+                respondError(req, StatusCode.INTERNAL_SERVER_ERROR);
+                return;
+            }
             pump.start();
 
             Runnable unpump = () -> {