From fd6a038bd8b6343af732638d879fb714d65b4bbb Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 16 Jan 2017 21:14:56 -0700 Subject: [PATCH] remove flatmap/then --- .../cloud/gateway/handler/WebClientRoutingWebHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/cloud/gateway/handler/WebClientRoutingWebHandler.java b/src/main/java/org/springframework/cloud/gateway/handler/WebClientRoutingWebHandler.java index 69e74229..163ea8dd 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/WebClientRoutingWebHandler.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/WebClientRoutingWebHandler.java @@ -35,7 +35,7 @@ public class WebClientRoutingWebHandler implements WebHandler { .headers(request.getHeaders()) .body((r, context) -> r.writeWith(request.getBody())); - return this.webClient.exchange(clientRequest).flatMap(clientResponse -> { + return this.webClient.exchange(clientRequest).then(clientResponse -> { // Defer committing the response until all route filters have run // Put client response as ServerWebExchange attribute and write response later WriteResponseFilter @@ -46,6 +46,6 @@ public class WebClientRoutingWebHandler implements WebHandler { response.getHeaders().putAll(clientResponse.headers().asHttpHeaders()); response.setStatusCode(clientResponse.statusCode()); return Mono.empty(); - }).next(); // TODO: is this correct? + }); } }