mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-22 05:49:04 +00:00
Clear Netty channel attribute
Closes gh-36158
This commit is contained in:
+17
-1
@@ -21,12 +21,15 @@ import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
import java.util.function.Function;
|
||||
|
||||
import io.netty.channel.Channel;
|
||||
import io.netty.util.Attribute;
|
||||
import io.netty.util.AttributeKey;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.jspecify.annotations.Nullable;
|
||||
import reactor.core.publisher.Mono;
|
||||
import reactor.netty.NettyOutbound;
|
||||
import reactor.netty.channel.ChannelOperations;
|
||||
import reactor.netty.http.client.HttpClient;
|
||||
import reactor.netty.http.client.HttpClientRequest;
|
||||
import reactor.netty.resources.ConnectionProvider;
|
||||
@@ -160,10 +163,14 @@ public class ReactorClientHttpConnector implements ClientHttpConnector, SmartLif
|
||||
.request(io.netty.handler.codec.http.HttpMethod.valueOf(method.name()));
|
||||
|
||||
requestSender = setUri(requestSender, uri);
|
||||
AtomicReference<Channel> channelRef = new AtomicReference<>();
|
||||
AtomicReference<ReactorClientHttpResponse> responseRef = new AtomicReference<>();
|
||||
|
||||
return requestSender
|
||||
.send((request, outbound) -> requestCallback.apply(adaptRequest(method, uri, request, outbound)))
|
||||
.send((request, outbound) -> {
|
||||
channelRef.set(((ChannelOperations<?, ?>) request).channel());
|
||||
return requestCallback.apply(adaptRequest(method, uri, request, outbound));
|
||||
})
|
||||
.responseConnection((response, connection) -> {
|
||||
ReactorClientHttpResponse clientResponse = new ReactorClientHttpResponse(response, connection);
|
||||
responseRef.set(clientResponse);
|
||||
@@ -175,6 +182,15 @@ public class ReactorClientHttpConnector implements ClientHttpConnector, SmartLif
|
||||
if (response != null) {
|
||||
response.releaseAfterCancel(method);
|
||||
}
|
||||
})
|
||||
.doOnTerminate(() -> {
|
||||
Channel channel = channelRef.get();
|
||||
if (channel != null) {
|
||||
Attribute<Map<String, Object>> attribute = channel.attr(ATTRIBUTES_KEY);
|
||||
if (attribute != null) {
|
||||
attribute.set(null);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user