root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add DataBuffer management in fragment rendering 

See gh-33194
This commit is contained in:
rstoyanchev 2024-08-06 14:06:21 +03:00
parent 8e2b27e5d8
commit 062c18a81d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
View File

@ -282,8 +282,9 @@ public class ViewResolutionResultHandler extends HandlerResultHandlerSupport imp
streamHandler.updateResponse(exchange); streamHandler.updateResponse(exchange);
} }
Flux<Flux<DataBuffer>> renderFlux = render.fragments().concatMap(fragment -> Flux<Flux<DataBuffer>> renderFlux = render.fragments()
renderFragment(fragment, streamHandler, locale, bindingContext, exchange)); .concatMap(fragment -> renderFragment(fragment, streamHandler, locale, bindingContext, exchange))
.doOnDiscard(DataBuffer.class, DataBufferUtils::release);
return response.writeAndFlushWith(renderFlux); return response.writeAndFlushWith(renderFlux);
} }
@ -552,9 +553,16 @@ public class ViewResolutionResultHandler extends HandlerResultHandlerSupport imp
DataBuffer suffix = encodeText("\n\n", charset, bufferFactory); DataBuffer suffix = encodeText("\n\n", charset, bufferFactory);
Mono<DataBuffer> content = DataBufferUtils.join(fragmentFlux) Mono<DataBuffer> content = DataBufferUtils.join(fragmentFlux)
.map(dataBuffer -> { .map(buffer -> {
String s = dataBuffer.toString(charset).replace("\n", "\ndata:"); String text;
return bufferFactory.wrap(s.getBytes(charset)); try {
text = buffer.toString(charset);
}
finally {
DataBufferUtils.release(buffer);
}
text = text.replace("\n", "\ndata:");
return bufferFactory.wrap(text.getBytes(charset));
}); });
return Flux.concat(Flux.just(prefix), content, Flux.just(suffix)); return Flux.concat(Flux.just(prefix), content, Flux.just(suffix));