unify by doFinal

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/WebClientWriteResponseFilter.java

@@ -19,6 +19,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import reactor.core.publisher.Mono;
+import reactor.core.publisher.SignalType;
 
 import org.springframework.core.Ordered;
 import org.springframework.http.server.reactive.ServerHttpResponse;
@@ -49,18 +50,21 @@ public int getOrder() {
 	public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 		// NOTICE: nothing in "pre" filter stage as CLIENT_RESPONSE_ATTR is not added
 		// until the WebHandler is run
-		return chain.filter(exchange).doOnError(throwable -> cleanup(exchange)).then(Mono.defer(() -> {
+		return chain.filter(exchange).then(Mono.defer(() -> {
 			ClientResponse clientResponse = exchange.getAttribute(CLIENT_RESPONSE_ATTR);
 			if (clientResponse == null) {
 				return Mono.empty();
 			}
 			log.trace("WebClientWriteResponseFilter start");
 			ServerHttpResponse response = exchange.getResponse();
 
-			return response.writeWith(clientResponse.body(BodyExtractors.toDataBuffers()))
-				// .log("webClient response")
-				.doOnCancel(() -> cleanup(exchange));
-		}));
+			return response.writeWith(clientResponse.body(BodyExtractors.toDataBuffers()));
+		}))
+		.doFinally(signalType -> {
+			if(SignalType.CANCEL == signalType || SignalType.ON_ERROR == signalType) {
+				cleanup(exchange);
+			}
+		});
 	}
 
 	private void cleanup(ServerWebExchange exchange) {