Skip to content

Suggests to dispose connection when cancelled In NettyWriteResponseFilter #3611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanjbaxter merged 4 commits into from
Mar 14, 2025
Merged

Suggests to dispose connection when cancelled In NettyWriteResponseFilter #3611

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bc974e
Bumping versions
spring-builds Mar 13, 2025
2f73ed2
fix typo
raccoonback Dec 2, 2024
3ecb4b6
dispose the connection regardless of the channel state
raccoonback Dec 2, 2024
02ab0bc
Merge branch '4.1.x' into pr/3611
ryanjbaxter Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ...rver/src/main/java/org/springframework/cloud/gateway/filter/NettyWriteResponseFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.commons.logging.LogFactory;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.SignalType;
import reactor.netty.Connection;

import org.springframework.core.Ordered;
Expand Down Expand Up @@ -98,8 +99,12 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
return (isStreamingMediaType(contentType)
? response.writeAndFlushWith(body.map(Flux::just))
: response.writeWith(body));
})).doOnCancel(() -> cleanup(exchange))
.doOnError(throwable -> cleanup(exchange));
}))
.doFinally(signalType -> {
if (signalType == SignalType.CANCEL || signalType == SignalType.ON_ERROR) {
cleanup(exchange);
}
});
// @formatter:on
}

Expand All @@ -116,12 +121,12 @@ else if (bufferFactory instanceof DefaultDataBufferFactory) {
byteBuf.release();
return buffer;
}
throw new IllegalArgumentException("Unkown DataBufferFactory type " + bufferFactory.getClass());
throw new IllegalArgumentException("Unknown DataBufferFactory type " + bufferFactory.getClass());
}

private void cleanup(ServerWebExchange exchange) {
Connection connection = exchange.getAttribute(CLIENT_RESPONSE_CONN_ATTR);
if (connection != null && connection.channel().isActive()) {
if (connection != null) {
connection.dispose();
}
}
Expand Down
Loading