spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-07 07:29:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2026-10-01 12:16:06 +02:00
parent 141a84724a 846521d8c5
commit f447f3c310
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
+1 -1
View File
@@ -137,7 +137,7 @@ public class XmlEventDecoder extends AbstractDecoder<XMLEvent> {
if (this.useAalto) {
AaltoDataBufferToXmlEvent mapper = new AaltoDataBufferToXmlEvent(hints);
return Flux.from(input)
.flatMapIterable(mapper)
.<XMLEvent>flatMapIterable(mapper)
.doFinally(signalType -> mapper.endOfInput());
}
else {
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
+2 -2
View File
@@ -681,14 +681,14 @@ final class DefaultWebClient implements WebClient {
}
private <T> Publisher<T> handleBodyFlux(ClientResponse response, Flux<T> body) {
body = body.onErrorResume(WebClientUtils.WRAP_EXCEPTION_PREDICATE, exceptionWrappingFunction(response));
body = body.onErrorResume(WebClientUtils.WRAP_EXCEPTION_PREDICATE, this.<T>exceptionWrappingFunction(response));
Mono<T> result = applyStatusHandlers(response);
return (result != null ? result.flux().switchIfEmpty(body) : body);
}
private <T> Mono<? extends ResponseEntity<Flux<T>>> handlerEntityFlux(ClientResponse response, Flux<T> body) {
ResponseEntity<Flux<T>> entity = new ResponseEntity<>(
body.onErrorResume(WebClientUtils.WRAP_EXCEPTION_PREDICATE, exceptionWrappingFunction(response)),
body.onErrorResume(WebClientUtils.WRAP_EXCEPTION_PREDICATE, this.<T>exceptionWrappingFunction(response)),
response.headers().asHttpHeaders(),
response.statusCode());